From 28bf011d057f0cda659cfe690ae515feadb35291 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sat, 12 Dec 2015 11:05:18 -0500 Subject: [PATCH] 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 --- README.rst | 4 ---- defaults/main.yaml | 1 - tasks/config.yaml | 1 - tests/test.yaml | 14 -------------- 4 files changed, 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 # Default: root jenkins_job_builder_user_group: root - # Path of home directory to be used. - # Default: /var/lib/jenkins_job_builder - jenkins_job_builder_user_home: /var/lib/jenkins_job_builder - Dependencies ------------ 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 @@ # tasks/config.yaml jenkins_job_builder_user_name: root jenkins_job_builder_user_group: "{{ jenkins_job_builder_user_name }}" -jenkins_job_builder_user_home: /var/lib/jenkins_job_builder jenkins_job_builder_config_job_builder_allow_duplicates: False jenkins_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 @@ state: directory with_items: - /etc/jenkins_jobs - - "{{ jenkins_job_builder_user_home }}" - name: Template jenkins_jobs.ini file. 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 @@ - "{{ rolename }}" post_tasks: - - name: Register jenkins_job_builder_user_home. - stat: - path: /var/lib/jenkins_job_builder - register: jenkins_job_builder_user_home_stat - - - name: Assert jenkins_job_builder_user_home tests. - assert: - that: - - jenkins_job_builder_user_home_stat.stat.exists - - jenkins_job_builder_user_home_stat.stat.isdir - - jenkins_job_builder_user_home_stat.stat.pw_name == 'root' - - jenkins_job_builder_user_home_stat.stat.gr_name == 'root' - - jenkins_job_builder_user_home_stat.stat.mode == '0755' - - name: Register /etc/jenkins_jobs. stat: path: /etc/jenkins_jobs