From eccd20e38c571a2365b52903e9b489f5155e1f41 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 12 Feb 2014 22:06:21 +0000 Subject: [PATCH] Stop separately caching repos for devstack images Since devstack-gate no longer relies on the workspace-cache directory, this is an unnecessary waste of effort. Change-Id: Ic9ef8b269d0184f5891d355901bbfb29f7273670 --- .../files/nodepool/scripts/cache_devstack.py | 2 +- .../nodepool/scripts/prepare_devstack.sh | 46 ------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/modules/openstack_project/files/nodepool/scripts/cache_devstack.py b/modules/openstack_project/files/nodepool/scripts/cache_devstack.py index f48b556521..9767c3aa84 100755 --- a/modules/openstack_project/files/nodepool/scripts/cache_devstack.py +++ b/modules/openstack_project/files/nodepool/scripts/cache_devstack.py @@ -21,7 +21,7 @@ import sys from common import run_local -DEVSTACK = os.path.expanduser('~/workspace-cache/devstack') +DEVSTACK = os.path.expanduser('/opt/git/openstack-dev/devstack') CACHEDIR = os.path.expanduser('~/cache/files') diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh b/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh index 993d76d2b8..6738fad91b 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh @@ -31,52 +31,6 @@ else exit 1 fi -rm -rf ~/workspace-cache -mkdir -p ~/workspace-cache - -cd ~/workspace-cache -git clone https://review.openstack.org/p/openstack-dev/devstack -git clone https://review.openstack.org/p/openstack-dev/grenade -git clone https://review.openstack.org/p/openstack-dev/pbr -git clone https://review.openstack.org/p/openstack-infra/devstack-gate -git clone https://review.openstack.org/p/openstack-infra/jeepyb -git clone https://review.openstack.org/p/openstack-infra/pypi-mirror -git clone https://review.openstack.org/p/openstack-infra/tripleo-ci -git clone https://review.openstack.org/p/openstack/ceilometer -git clone https://review.openstack.org/p/openstack/cinder -git clone https://review.openstack.org/p/openstack/diskimage-builder -git clone https://review.openstack.org/p/openstack/glance -git clone https://review.openstack.org/p/openstack/heat -git clone https://review.openstack.org/p/openstack/horizon -git clone https://review.openstack.org/p/openstack/ironic -git clone https://review.openstack.org/p/openstack/keystone -git clone https://review.openstack.org/p/openstack/neutron -git clone https://review.openstack.org/p/openstack/nova -git clone https://review.openstack.org/p/openstack/os-apply-config -git clone https://review.openstack.org/p/openstack/os-collect-config -git clone https://review.openstack.org/p/openstack/os-refresh-config -git clone https://review.openstack.org/p/openstack/oslo.config -git clone https://review.openstack.org/p/openstack/oslo.messaging -git clone https://review.openstack.org/p/openstack/python-ceilometerclient -git clone https://review.openstack.org/p/openstack/python-cinderclient -git clone https://review.openstack.org/p/openstack/python-glanceclient -git clone https://review.openstack.org/p/openstack/python-heatclient -git clone https://review.openstack.org/p/openstack/python-ironicclient -git clone https://review.openstack.org/p/openstack/python-keystoneclient -git clone https://review.openstack.org/p/openstack/python-neutronclient -git clone https://review.openstack.org/p/openstack/python-novaclient -git clone https://review.openstack.org/p/openstack/python-openstackclient -git clone https://review.openstack.org/p/openstack/python-swiftclient -git clone https://review.openstack.org/p/openstack/requirements -git clone https://review.openstack.org/p/openstack/swift -git clone https://review.openstack.org/p/openstack/tempest -git clone https://review.openstack.org/p/openstack/tripleo-heat-templates -git clone https://review.openstack.org/p/openstack/tripleo-image-elements -git clone https://review.openstack.org/p/openstack/tripleo-incubator -# and stackforge libraries we might want to test with -git clone https://review.openstack.org/p/stackforge/pecan -git clone https://review.openstack.org/p/stackforge/wsme - DISTRIB_CODENAME=`lsb_release -sc` cd /opt/nodepool-scripts/