summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-10-31 13:50:44 -0400
committerMonty Taylor <mordred@inaugust.com>2013-10-31 13:50:44 -0400
commit6f455d9a3641b1f581c2e96f59dc8536e27dc5b1 (patch)
tree344d8180e4d4c4acd6cca75d8c44792e23abe45d
parentb3bc1a9851ebaea71ed644e1031996bf7d910c62 (diff)
downloadpbr-6f455d9a3641b1f581c2e96f59dc8536e27dc5b1.tar.gz
Add wheel mirror structure awareness
We are going to start having wheels in the gate. Having them there should not break folks who are not using wheels. Don't start actually consuming wheels yet, but add awareness about the wheel structure to the pypi config. Change-Id: Id29bb1bb31fc1647f8e1ea00bab487e447ba2838
-rw-r--r--tools/integration.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/integration.sh b/tools/integration.sh
index eedd1a3..6fa9f10 100644
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -62,6 +62,10 @@ mirrors:
output: $pypidir
EOF
+# 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 ' ' '-'`
+
# PROJECTS is a list of projects that we're testing
PROJECTS=$*
@@ -91,6 +95,7 @@ EOF
cat <<EOF > ~/.pip/pip.conf
[global]
index-url = $pypiurl
+extra-index-url = $pypiurl/$distro
extra-index-url = http://pypi.openstack.org/openstack
log = $HOME/pip.log
EOF