From 5c7c9b5396f48394521ceaf55dc718a8a8ab22d0 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 6 Mar 2013 17:37:48 -0800 Subject: [PATCH] Use new openstack-specific mirror. Change-Id: I60dae939a1306c78d0da8ba6ae58fe4265ee97fb Reviewed-on: https://review.openstack.org/23778 Reviewed-by: Jeremy Stanley Approved: James E. Blair Tested-by: Jenkins --- .../files/slave_scripts/select-mirror.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/select-mirror.sh b/modules/jenkins/files/slave_scripts/select-mirror.sh index ff6cd89173..689f31384f 100755 --- a/modules/jenkins/files/slave_scripts/select-mirror.sh +++ b/modules/jenkins/files/slave_scripts/select-mirror.sh @@ -30,19 +30,26 @@ rm -f ~/.pydistutils.cfg mkdir -p ~/.pip rm -f ~/.pip/pip.conf -# For OpenStack projects, use the pypi.openstack.org mirror exclusively -if [ "$org" == "openstack" ] +# Noop, do not setup any mirrors to allow requirements to talk to the +# outside world. +if [ "$org" == "openstack" ] && [ "$project" == "requirements" ] then -echo $org + exit 0 +# For OpenStack projects, use the pypi.openstack.org mirror exclusively +elif [ "$org" == "openstack" ] +then + cat < ~/.pydistutils.cfg +[easy_install] +index_url = http://pypi.openstack.org/openstack +EOF cat < ~/.pip/pip.conf [global] -index-url = http://pypi.openstack.org -extra-index-url = http://pypi.python.org/simple +index-url = http://pypi.openstack.org/openstack EOF else cat < ~/.pip/pip.conf [global] -index-url = http://pypi.openstack.org +index-url = http://pypi.openstack.org/openstack extra-index-url = http://pypi.python.org/simple EOF fi