From c531f41138f56f637745af527946228ba7e82ff0 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Fri, 24 Jan 2014 19:15:21 +1300 Subject: [PATCH] Remove TRIPLEO_ROOT and pull-tools tripleo-incubator hasn't been cloned at this point so we can't call pull-tools, devtest_setup.sh will do this when the job runs. Removing pull-tools means there is no longer a need for TRIPLEO_ROOT. Change-Id: Id7b356c644894dbd6335423d81cb6f2d2261a2fb --- .../files/nodepool/scripts/prepare_tripleo.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh index b3108280cf..b933eafa31 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh @@ -26,18 +26,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get \ --assume-yes install build-essential python-dev \ linux-headers-virtual linux-headers-`uname -r` -rm -rf ~/tripleo -mkdir -p ~/tripleo -export TRIPLEO_ROOT=~/tripleo - -cd ~/tripleo -# 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 - # tripleo-gate runs with two networks - the public access network and eth1 # pointing at the in-datacentre L2 network where we can talk to the test # environments directly. We need to enable DHCP on eth1 though.