From dec97720d521b8551dc8b8a220982874f3876d6f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 9 Sep 2013 17:51:12 -0700 Subject: [PATCH] Select mirror when diffing JJB XML files. * .../jenkins_job_builder/config/job-builder.yaml: * .../jenkins_job_builder/config/openstack-ci-puppet.yaml: Run select-mirror.sh before running the compare scripts. This ensures that dependencies not in the OpenStack mirror can be downloaded. Without it pip may be configured to only use the OpenStack mirror. Change-Id: Ie1ce67deb78e4bdfe20884bb6bda0fbb57db2f0e --- .../files/jenkins_job_builder/config/job-builder.yaml | 4 +++- .../files/jenkins_job_builder/config/openstack-ci-puppet.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml index 1ab1f3e508..f50ba9297d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml @@ -24,7 +24,9 @@ builders: - gerrit-git-prep - - shell: "./tools/run-compare-xml.sh" + - shell: | + source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra jenkins-job-builder + ./tools/run-compare-xml.sh publishers: - console-log diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml index 20bbdc0771..721996ed41 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml @@ -16,7 +16,9 @@ builders: - gerrit-git-prep - - shell: "./tools/run-layout.sh openstack-infra config" + - shell: | + source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra config + ./tools/run-layout.sh openstack-infra config publishers: - console-log