Revert use of docs env in docs job

The docs jobs _intentionally_ run only "python setup.py build_sphinx"
because that is the standard way python projects build docs, and that
is what the OpenStack Project Testing Interface[1] specifies.

[1] http://governance.openstack.org/reference/project-testing-interface.html

Revert "Fix search for docs tox job in run-docs.sh"

This reverts commit 3f8b45a8c0.

Revert "run-docs.sh: execute docs job if present"

This reverts commit 0ced503c27.

Change-Id: Ie4420db4d34576f1627a680b883602cdff1fac71
This commit is contained in:
James E. Blair 2015-08-10 08:49:43 -07:00
parent c7fc68bfb0
commit 95e97737e8

View File

@ -7,15 +7,11 @@
# what packages we ended up testing. # what packages we ended up testing.
# #
venv=venv
mkdir -p doc/build mkdir -p doc/build
export HUDSON_PUBLISH_DOCS=1 export HUDSON_PUBLISH_DOCS=1
if [ $(tox --showconfig | grep -c "\[testenv:docs\]") == 1 ]; then
venv=docs
tox -e$venv
else
venv=venv
tox -e$venv -- python setup.py build_sphinx tox -e$venv -- python setup.py build_sphinx
fi
result=$? result=$?
[ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip [ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip