diff --git a/modules/jenkins/files/slave_scripts/select-mirror.sh b/modules/jenkins/files/slave_scripts/select-mirror.sh index 21319dea62..6aea1cbf95 100755 --- a/modules/jenkins/files/slave_scripts/select-mirror.sh +++ b/modules/jenkins/files/slave_scripts/select-mirror.sh @@ -39,26 +39,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