From 343cff816b9ffd6d25d76481ba2a6a0eb7495352 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 4 Dec 2013 18:29:56 +0000 Subject: [PATCH] Revert "Add support for per-distro wheel mirrors" This reverts commit 639c7e707804b797da8b46d09ed7c55768809b56 http://logs.openstack.org/62/49062/11/gate/gate-keystone-python26/07e32fc/console.html --- modules/jenkins/files/slave_scripts/select-mirror.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/select-mirror.sh b/modules/jenkins/files/slave_scripts/select-mirror.sh index d2d761d684..7825490b09 100755 --- a/modules/jenkins/files/slave_scripts/select-mirror.sh +++ b/modules/jenkins/files/slave_scripts/select-mirror.sh @@ -45,26 +45,20 @@ then # For OpenStack projects, use the pypi.openstack.org mirror exclusively elif [ "$org" == "openstack" ] then - # wheel mirrors are below a dir level containing distro and release - # because the wheel format itself does not distinguish - distro=`lsb_release -i -r -s | xargs | tr ' ' '-'` - - export TOX_INDEX_URL="http://pypi.openstack.org/openstack/$distro" + export TOX_INDEX_URL='http://pypi.openstack.org/openstack' cat < ~/.pydistutils.cfg [easy_install] index_url = http://pypi.openstack.org/openstack EOF cat < ~/.pip/pip.conf [global] -index-url = http://pypi.openstack.org/openstack/$distro -extra-index-url = http://pypi.openstack.org/openstack +index-url = http://pypi.openstack.org/openstack EOF else cat < ~/.pip/pip.conf [global] timeout = 60 -index-url = http://pypi.openstack.org/openstack/$distro -extra-index-url = http://pypi.openstack.org/openstack +index-url = http://pypi.openstack.org/openstack extra-index-url = http://pypi.python.org/simple EOF fi