From a06930c67a9fa5cf8aea1fcf7e0dbfd887f468d3 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 15 Mar 2017 15:48:38 -0400 Subject: [PATCH] Remove ansible-role-jenkins-job-builder We no longer need to depend on JJB, so remove it. Change-Id: Ifdf3c472608d5daf7699d9f1eed00b12e0f0f8cb Signed-off-by: Paul Belanger --- playbooks/group_vars/zuul-executor.yaml | 3 --- playbooks/templates/zuul/etc/zuul/zuul.conf.j2 | 1 - playbooks/zuul-executor.yaml | 1 - tools/install_roles.sh | 1 - 4 files changed, 6 deletions(-) diff --git a/playbooks/group_vars/zuul-executor.yaml b/playbooks/group_vars/zuul-executor.yaml index 22224aa..d26481d 100644 --- a/playbooks/group_vars/zuul-executor.yaml +++ b/playbooks/group_vars/zuul-executor.yaml @@ -12,9 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. --- -# windmill.jenkins-job-builder -jenkins_job_builder_pip_virtualenv: /opt/venv/zuul-executor - # windmill.zuul zuul_file_zuul_executor_service_config_src: zuul/etc/sysconfig/zuul-executor diff --git a/playbooks/templates/zuul/etc/zuul/zuul.conf.j2 b/playbooks/templates/zuul/etc/zuul/zuul.conf.j2 index 025ef18..a60930d 100644 --- a/playbooks/templates/zuul/etc/zuul/zuul.conf.j2 +++ b/playbooks/templates/zuul/etc/zuul/zuul.conf.j2 @@ -23,7 +23,6 @@ pidfile = /var/run/zuul-scheduler/zuul-scheduler.pid state_dir = /var/lib/zuul [executor] -jenkins_jobs=/var/lib/zuul log_config = /etc/zuul/executor-logging.conf workspace_root=/var/lib/zuul/workspace diff --git a/playbooks/zuul-executor.yaml b/playbooks/zuul-executor.yaml index 0d8887c..661d6a1 100644 --- a/playbooks/zuul-executor.yaml +++ b/playbooks/zuul-executor.yaml @@ -16,7 +16,6 @@ hosts: zuul-executor roles: - - openstack.jenkins-job-builder - openstack.zuul post_tasks: diff --git a/tools/install_roles.sh b/tools/install_roles.sh index 199ec16..5c9f7e5 100755 --- a/tools/install_roles.sh +++ b/tools/install_roles.sh @@ -28,7 +28,6 @@ zuul-cloner -m $CLONEMAP \ --cache-dir /opt/git \ git://git.openstack.org \ openstack/ansible-role-diskimage-builder \ - openstack/ansible-role-jenkins-job-builder \ openstack/ansible-role-nodepool \ openstack/ansible-role-shade \ openstack/ansible-role-ssh \