summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2015-12-23 16:50:37 -0500
committerPaul Belanger <pabelanger@redhat.com>2015-12-23 18:11:05 -0500
commit745ed2c9db29b6d302f69c1beeaa7c8992afab90 (patch)
tree89f86f6dec4432e9750adb260787f2897fbaf76e
parent9d3eedcb66fb2a23d8aa753a82f02bee83711626 (diff)
Drop included config directory
It doesn't make sense to rsync an empty directory by defailt. Change-Id: I32a36387e1b6b906a44f88f5e78d8e73221b2e6a Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 23 Dec 2015 23:16:53 +0000 Reviewed-on: https://review.openstack.org/261112 Project: openstack/ansible-role-jenkins-job-builder Branch: refs/heads/master
-rw-r--r--defaults/main.yaml2
-rw-r--r--files/etc/jenkins_jobs/config/README.rst3
-rw-r--r--handlers/main.yaml1
-rw-r--r--tasks/config.yaml3
4 files changed, 3 insertions, 6 deletions
diff --git a/defaults/main.yaml b/defaults/main.yaml
index 2cab401..13349b4 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -30,7 +30,7 @@ jenkins_job_builder_file_jobs_dest: /etc/jenkins_jobs/config
30jenkins_job_builder_file_jobs_group: "{{ ansible_ssh_user }}" 30jenkins_job_builder_file_jobs_group: "{{ ansible_ssh_user }}"
31jenkins_job_builder_file_jobs_mode: "0755" 31jenkins_job_builder_file_jobs_mode: "0755"
32jenkins_job_builder_file_jobs_owner: "{{ ansible_ssh_user }}" 32jenkins_job_builder_file_jobs_owner: "{{ ansible_ssh_user }}"
33jenkins_job_builder_file_jobs_src: etc/jenkins_jobs/config/ 33jenkins_job_builder_file_jobs_src: ""
34 34
35jenkins_job_builder_template_jenkins_jobs_ini_dest: /etc/jenkins_jobs/jenkins_jobs.ini 35jenkins_job_builder_template_jenkins_jobs_ini_dest: /etc/jenkins_jobs/jenkins_jobs.ini
36jenkins_job_builder_template_jenkins_jobs_ini_group: "{{ jenkins_job_builder_user_group }}" 36jenkins_job_builder_template_jenkins_jobs_ini_group: "{{ jenkins_job_builder_user_group }}"
diff --git a/files/etc/jenkins_jobs/config/README.rst b/files/etc/jenkins_jobs/config/README.rst
deleted file mode 100644
index 602ac8e..0000000
--- a/files/etc/jenkins_jobs/config/README.rst
+++ /dev/null
@@ -1,3 +0,0 @@
1# This file is generated by Ansible
2# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
3#
diff --git a/handlers/main.yaml b/handlers/main.yaml
index e938a14..457cf85 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -13,7 +13,6 @@
13# under the License. 13# under the License.
14--- 14---
15- name: Reload jenkins-jobs 15- name: Reload jenkins-jobs
16 ignore_errors: yes
17 shell: "jenkins-jobs --conf {{ jenkins_job_builder_template_jenkins_jobs_ini_dest }} update {{ jenkins_job_builder_file_jobs_dest }} --delete-old" 16 shell: "jenkins-jobs --conf {{ jenkins_job_builder_template_jenkins_jobs_ini_dest }} update {{ jenkins_job_builder_file_jobs_dest }} --delete-old"
18 sudo: yes 17 sudo: yes
19 sudo_user: "{{ jenkins_job_builder_user_name }}" 18 sudo_user: "{{ jenkins_job_builder_user_name }}"
diff --git a/tasks/config.yaml b/tasks/config.yaml
index 436bf3c..691f101 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -37,11 +37,12 @@
37 owner: "{{ jenkins_job_builder_file_jobs_owner }}" 37 owner: "{{ jenkins_job_builder_file_jobs_owner }}"
38 state: directory 38 state: directory
39 39
40- name: Rsyc jenkins jobs configuration. 40- name: Rsync jenkins jobs configuration.
41 sudo: no 41 sudo: no
42 synchronize: 42 synchronize:
43 delete: yes 43 delete: yes
44 dest: "{{ jenkins_job_builder_file_jobs_dest }}" 44 dest: "{{ jenkins_job_builder_file_jobs_dest }}"
45 perms: yes 45 perms: yes
46 src: "{{ jenkins_job_builder_file_jobs_src }}" 46 src: "{{ jenkins_job_builder_file_jobs_src }}"
47 when: jenkins_job_builder_file_jobs_src != ""
47 notify: Reload jenkins-jobs 48 notify: Reload jenkins-jobs