summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-04-25 09:12:53 +1200
committerRobert Collins <rbtcollins@hp.com>2015-04-25 13:21:25 +1200
commit53feb927eb944e9d104d494a33e1125f2e23a9a2 (patch)
tree9848a0471f3b43b19b9996ac060c30242ddbc2ff
parent52fcd502bf9d23aac88dae2b4b34d36f7aa26ea8 (diff)
downloadpbr-53feb927eb944e9d104d494a33e1125f2e23a9a2.tar.gz
Honour new test variable PIPVERSION
This allows testing with unreleased pips, which is important to know if something is going to cause us or our users trouble. Change-Id: Icb3a9c1486c76b673d25a3d18792baad3d26c763
-rw-r--r--tools/integration.sh17
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/integration.sh b/tools/integration.sh
index a385203..82eb84d 100644
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -1,11 +1,13 @@
#!/bin/bash -xe
+# Bootstrappping
+export PIPVERSION=pip
function mkvenv {
venv=$1
rm -rf $venv
virtualenv $venv
- $venv/bin/pip install -U pip wheel
+ $venv/bin/pip install -U $PIPVERSION wheel
# If a change to PBR is being tested, preinstall the wheel for it
if [ -n "$PBR_CHANGE" ] ; then
@@ -43,6 +45,19 @@ grep -v '^#' $REPODIR/requirements/global-requirements.txt | while read req
do
$tmpdir/wheelhouse/bin/pip wheel "$req"
done
+# Things outside of requirements.txt
+# Specific PIP versions:
+# - build/download a local wheel
+if [ -n "${PBR_PIP_VERSION:-}" ]; then
+ td=$(mktemp -d)
+ $tmpdir/wheelhouse/bin/pip wheel -w $td $PBR_PIP_VERSION
+ # This version will now be installed in every new venv.
+ export PIPVERSION="$td/$(ls $td)"
+ $tmpdir/wheelhouse/bin/pip install -U $PIPVERSION
+ # We have pip in global-requirements as open-ended requirements,
+ # but since we don't use -U in any other invocations, our version
+ # of pip should be sticky.
+fi
set -e
#BRANCH