opendev/system-config
Code Issues Proposed changes

Revert "Add support for per-distro wheel mirrors"

Browse Source 
This reverts commit 639c7e7078

http://logs.openstack.org/62/49062/11/gate/gate-keystone-python26/07e32fc/console.html
This commit is contained in:
James E. Blair 2013-12-04 18:29:56 +00:00 committed by Gerrit Code Review
parent 639c7e7078
commit 343cff816b
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/jenkins/files/slave_scripts/select-mirror.sh
View File

@ -45,26 +45,20 @@ then
# For OpenStack projects, use the pypi.openstack.org mirror exclusively # For OpenStack projects, use the pypi.openstack.org mirror exclusively
elif [ "$org" == "openstack" ] elif [ "$org" == "openstack" ]
then then
# wheel mirrors are below a dir level containing distro and release export TOX_INDEX_URL='http://pypi.openstack.org/openstack'
# 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"
cat <<EOF > ~/.pydistutils.cfg cat <<EOF > ~/.pydistutils.cfg
[easy_install] [easy_install]
index_url = http://pypi.openstack.org/openstack index_url = http://pypi.openstack.org/openstack
EOF EOF
cat <<EOF > ~/.pip/pip.conf cat <<EOF > ~/.pip/pip.conf
[global] [global]
index-url = http://pypi.openstack.org/openstack/$distro index-url = http://pypi.openstack.org/openstack
extra-index-url = http://pypi.openstack.org/openstack
EOF EOF
else else
cat <<EOF > ~/.pip/pip.conf cat <<EOF > ~/.pip/pip.conf
[global] [global]
timeout = 60 timeout = 60
index-url = http://pypi.openstack.org/openstack/$distro index-url = http://pypi.openstack.org/openstack
extra-index-url = http://pypi.openstack.org/openstack
extra-index-url = http://pypi.python.org/simple extra-index-url = http://pypi.python.org/simple
EOF EOF
fi fi