From e6dc5821f5c951638ae5125685db13f7dc7e0a9e Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 17 Jan 2014 07:10:22 +1300 Subject: [PATCH] Improve tripleo nodepool image build efficiency. Turns out there is a cache of git trees built. We can use that to avoid some clones. There are more that can be saved - this is the low hanging fruit (with a bug files and linked for the harder stuff). Change-Id: Ib720db7b963a314ad28ef4287d7965c5c30f0883 --- .../files/jenkins_job_builder/config/tripleo.yaml | 2 +- .../files/nodepool/scripts/prepare_tripleo.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml index 47c5c14f53..603082cff0 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml @@ -18,7 +18,7 @@ export DEVSTACK_GATE_EXERCISES=0 export GEARDSERVER=138.35.77.19 function gate_hook { - bash -xe /home/jenkins/tripleo/tripleo-ci/toci_gate_test.sh + bash -xe /opt/git/openstack-infra/tripleo-ci/toci_gate_test.sh } export -f gate_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh index fd8aa255a1..58bf333e28 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh @@ -35,9 +35,9 @@ mkdir -p ~/tripleo export TRIPLEO_ROOT=~/tripleo cd ~/tripleo -git clone https://review.openstack.org/p/openstack-infra/tripleo-ci -git clone https://review.openstack.org/p/openstack/tripleo-incubator -bash tripleo-incubator/scripts/pull-tools +# XXX: Note that this is redundant with the cached copies in /opt/git. +# see https://bugs.launchpad.net/openstack-ci/+bug/1269889 +bash /opt/git/openstack/tripleo-incubator/scripts/pull-tools # Instead of running pull-tools, we'll eventually want to get the # refresh-env script working: # source tripleo-incubator/scripts/refresh-env ~/tripleo