openstack/project-config
Code Issues Proposed changes

Move to pbr freeze from pip freeze

Browse Source 
For the things that use pbr, we no longer have git shas in the version
numbers. So, in order to verify what exact version of things we're
installing, use pbr freeze to collect the information.

Change-Id: I41ff993aa86e6a7ac1beed3cc5a3b94dcadbdd7c
This commit is contained in:
Monty Taylor 2014-12-16 18:11:27 -05:00
parent 6fd8d7d01c
commit ad5bbb498b
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/scripts/run-cover.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -xe
# Run coverage via tox. Also, run pip freeze on the
# Run coverage via tox. Also, run pbr freeze on the
# resulting environment at the end so that we have a record of exactly
# what packages we ended up testing.
@ -15,10 +15,11 @@ python setup.py --version
tox -e$venv
result=$?
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin pip freeze output from test virtualenv:"
echo "Begin $freezecmd freeze output from test virtualenv:"
echo "======================================================================"
.tox/$venv/bin/pip freeze
tox -e$venv -- $freezecmd freeze
echo "======================================================================"
exit $result

7
jenkins/scripts/run-docs.sh
View File

@ -2,16 +2,17 @@
# If a bundle file is present, call tox with the jenkins version of
# the test environment so it is used. Otherwise, use the normal
# (non-bundle) test environment. Also, run pip freeze on the
# (non-bundle) test environment. Also, run pbr freeze on the
# resulting environment at the end so that we have a record of exactly
# what packages we ended up testing.
#
venv=venv
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin pip freeze output from test virtualenv:"
echo "Begin pbr freeze output from test virtualenv:"
echo "======================================================================"
tox -e$venv -- pip freeze
tox -e$venv -- $freezecmd freeze
echo "======================================================================"
mkdir -p doc/build

10
jenkins/scripts/run-pep8.sh
View File

@ -14,12 +14,16 @@
# License for the specific language governing permissions and limitations
# under the License.
tox -v -epep8
venv=pep8
tox -v -e$venv
rc=$?
echo "Begin pip freeze output from test virtualenv:"
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin $freezecmd freeze output from test virtualenv:"
echo "======================================================================"
.tox/pep8/bin/pip freeze
tox -e$venv -- $freezecmd freeze
echo "======================================================================"
exit $rc

8
jenkins/scripts/run-selenium.sh
View File

@ -2,7 +2,7 @@
# If a bundle file is present, call tox with the jenkins version of
# the test environment so it is used. Otherwise, use the normal
# (non-bundle) test environment. Also, run pip freeze on the
# (non-bundle) test environment. Also, run pbr freeze on the
# resulting environment at the end so that we have a record of exactly
# what packages we ended up testing.
#
@ -21,9 +21,11 @@ result=$?
pkill Xvfb 2>&1 > /dev/null
set -e
echo "Begin pip freeze output from test virtualenv:"
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin $freezecmd freeze output from test virtualenv:"
echo "======================================================================"
.tox/$venv/bin/pip freeze
tox -e$venv -- $freezecmd freeze
echo "======================================================================"
exit $result

7
jenkins/scripts/run-tox.sh
View File

@ -2,7 +2,7 @@
# If a bundle file is present, call tox with the jenkins version of
# the test environment so it is used. Otherwise, use the normal
# (non-bundle) test environment. Also, run pip freeze on the
# (non-bundle) test environment. Also, run pbr freeze on the
# resulting environment at the end so that we have a record of exactly
# what packages we ended up testing.
#
@ -34,10 +34,11 @@ sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre
tox -v -e$venv
result=$?
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin pip freeze output from test virtualenv:"
echo "Begin $freezecmd freeze output from test virtualenv:"
echo "======================================================================"
.tox/$venv/bin/pip freeze
tox -e$venv -- $freezecmd freeze
echo "======================================================================"
if [ -d ".testrepository" ] ; then