openstack
/
project-config
Code Issues Proposed changes

Run freeze command after running tox 

In the run-docs.sh script we attempted to run the freezecmd out of the
tox venv dirs before running tox. This means there was no tox venv to
run the command out of and it failed. Move the execution of the
freezecmd to after the initial tox run so that the freeze command is
available in the created virtualenv.

Fixes-bug: 1405451
Change-Id: I9d33aa1a06c5351e11181790641635cfc1d10874
This commit is contained in:
Clark Boylan 2014-12-24 08:30:56 -08:00
parent 25541f1ec5
commit 5c0896b8d8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,12 @@
#
venv=venv
mkdir -p doc/build
export HUDSON_PUBLISH_DOCS=1
tox -e$venv -- python setup.py build_sphinx
result=$?
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin pbr freeze output from test virtualenv:"
@ -15,11 +21,6 @@ echo "======================================================================"
.tox/${venv}/bin/${freezecmd} freeze
echo "======================================================================"
mkdir -p doc/build
export HUDSON_PUBLISH_DOCS=1
tox -e$venv -- python setup.py build_sphinx
result=$?
if [ -z "$ZUUL_REFNAME" ] || [ "$ZUUL_REFNAME" == "master" ] ; then
: # Leave the docs where they are.
elif `echo $ZUUL_REFNAME | grep refs/tags/ >/dev/null` ; then