summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2015-12-12 11:05:18 -0500
committerPaul Belanger <pabelanger@redhat.com>2015-12-12 11:09:12 -0500
commit28bf011d057f0cda659cfe690ae515feadb35291 (patch)
treeb2f0b474a395a9ba3747f0c46625efa0ff865f2d
parent2eaf536e4cb3fe244712f78ce18e58a8a0ed42d5 (diff)
Drop user_home setting
We won't actually use this, as our jobs will be stored in /etc/jenkins_jobs. Change-Id: I81aaf0adf117aeb4cc59418bf42199bf4a5ddc64 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Submitted-by: Jenkins Submitted-at: Sat, 12 Dec 2015 16:29:28 +0000 Reviewed-on: https://review.openstack.org/256955 Project: openstack/ansible-role-jenkins-job-builder Branch: refs/heads/master
-rw-r--r--README.rst4
-rw-r--r--defaults/main.yaml1
-rw-r--r--tasks/config.yaml1
-rw-r--r--tests/test.yaml14
4 files changed, 0 insertions, 20 deletions
diff --git a/README.rst b/README.rst
index 0c3acfa..f428068 100644
--- a/README.rst
+++ b/README.rst
@@ -39,10 +39,6 @@ Role Variables
39 # Default: root 39 # Default: root
40 jenkins_job_builder_user_group: root 40 jenkins_job_builder_user_group: root
41 41
42 # Path of home directory to be used.
43 # Default: /var/lib/jenkins_job_builder
44 jenkins_job_builder_user_home: /var/lib/jenkins_job_builder
45
46Dependencies 42Dependencies
47------------ 43------------
48 44
diff --git a/defaults/main.yaml b/defaults/main.yaml
index feddefd..a16bc4e 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -15,7 +15,6 @@
15# tasks/config.yaml 15# tasks/config.yaml
16jenkins_job_builder_user_name: root 16jenkins_job_builder_user_name: root
17jenkins_job_builder_user_group: "{{ jenkins_job_builder_user_name }}" 17jenkins_job_builder_user_group: "{{ jenkins_job_builder_user_name }}"
18jenkins_job_builder_user_home: /var/lib/jenkins_job_builder
19 18
20jenkins_job_builder_config_job_builder_allow_duplicates: False 19jenkins_job_builder_config_job_builder_allow_duplicates: False
21jenkins_job_builder_config_job_builder_ignore_cache: True 20jenkins_job_builder_config_job_builder_ignore_cache: True
diff --git a/tasks/config.yaml b/tasks/config.yaml
index ade7d0a..479f1ef 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -20,7 +20,6 @@
20 state: directory 20 state: directory
21 with_items: 21 with_items:
22 - /etc/jenkins_jobs 22 - /etc/jenkins_jobs
23 - "{{ jenkins_job_builder_user_home }}"
24 23
25- name: Template jenkins_jobs.ini file. 24- name: Template jenkins_jobs.ini file.
26 template: 25 template:
diff --git a/tests/test.yaml b/tests/test.yaml
index 68bc31d..9b26056 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -27,20 +27,6 @@
27 - "{{ rolename }}" 27 - "{{ rolename }}"
28 28
29 post_tasks: 29 post_tasks:
30 - name: Register jenkins_job_builder_user_home.
31 stat:
32 path: /var/lib/jenkins_job_builder
33 register: jenkins_job_builder_user_home_stat
34
35 - name: Assert jenkins_job_builder_user_home tests.
36 assert:
37 that:
38 - jenkins_job_builder_user_home_stat.stat.exists
39 - jenkins_job_builder_user_home_stat.stat.isdir
40 - jenkins_job_builder_user_home_stat.stat.pw_name == 'root'
41 - jenkins_job_builder_user_home_stat.stat.gr_name == 'root'
42 - jenkins_job_builder_user_home_stat.stat.mode == '0755'
43
44 - name: Register /etc/jenkins_jobs. 30 - name: Register /etc/jenkins_jobs.
45 stat: 31 stat:
46 path: /etc/jenkins_jobs 32 path: /etc/jenkins_jobs