diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-04 05:28:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-04 05:28:00 +0000 |
| commit | f3c8de8ac71df5e9c369ad4515698aae976fb335 (patch) | |
| tree | 12ed5a661956b59f47ed21ca95ba66d3037e8c47 | |
| parent | 088a26bef340554ac9de339c51a1724bf468d602 (diff) | |
| parent | 2559759d3a8ed83a9d8f1e87fd61f9c2c724cbd8 (diff) | |
| download | pbr-f3c8de8ac71df5e9c369ad4515698aae976fb335.tar.gz | |
Merge "Build a wheel when integration testing PBR changes"
| -rw-r--r-- | tools/integration.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/integration.sh b/tools/integration.sh index f4b5689..a6f0b1a 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -7,9 +7,9 @@ function mkvenv { virtualenv $venv $venv/bin/pip install -U pip wheel - # If a change to PBR is being tested, preinstall from that source tree + # If a change to PBR is being tested, preinstall the wheel for it if [ -n "$PBR_CHANGE" ] ; then - $venv/bin/pip install $pbrsdistdir + $venv/bin/pip install $pbrsdistdir/dist/pbr-*.whl fi } @@ -40,8 +40,10 @@ pbrsdistdir=$tmpdir/pbrsdist git clone $REPODIR/pbr $pbrsdistdir cd $pbrsdistdir -# Flag whether a change to PBR is being tested +# Prepare a wheel and flag whether a change to PBR is being tested if git fetch $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF ; then + mkvenv wheel + wheel/bin/python setup.py bdist_wheel PBR_CHANGE=1 fi |