From 95e97737e8f06ac1bf3a2ee57625791a90a3fc88 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Mon, 10 Aug 2015 08:49:43 -0700
Subject: [PATCH] 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 3f8b45a8c0cc87b9f6d79c10e1b73c00adb7ce4e.

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

This reverts commit 0ced503c2792b2f50559f66abd92d81e1571b77e.

Change-Id: Ie4420db4d34576f1627a680b883602cdff1fac71
---
 jenkins/scripts/run-docs.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/jenkins/scripts/run-docs.sh b/jenkins/scripts/run-docs.sh
index fd5ff584f6..7f833770bb 100755
--- a/jenkins/scripts/run-docs.sh
+++ b/jenkins/scripts/run-docs.sh
@@ -7,15 +7,11 @@
 # what packages we ended up testing.
 #
 
+venv=venv
+
 mkdir -p doc/build
 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
-fi
+tox -e$venv -- python setup.py build_sphinx
 result=$?
 
 [ -e .tox/$venv/bin/pbr ] && freezecmd=pbr || freezecmd=pip