1 files changed, 15 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index 313f1eca2..8f86a0143 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = py{27,3},pep8,functional{,-py3},coverage
+envlist = py3,pep8,functional-py3,coverage
 
 [testenv]
 usedevelop=True
@@ -9,8 +9,11 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY BRANCH
 setenv =
    VIRTUAL_ENV={envdir}
 deps =
+    -chttps://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt
+    -c{toxinidir}/upper-constraints.txt
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
+
 whitelist_externals = /bin/bash
 
 [testenv:py27]
@@ -44,6 +47,17 @@ commands =
 basepython = python3
 commands = {[testenv:functional]commands}
 
+[testenv:docs]
+deps = -rdocs/requirements.txt
+commands =
+    sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+    echo "Generated docs available in {toxinidir}/docs/_build/html"
+whitelist_externals = echo
+
+[testenv:docs-linkcheck]
+deps = -rdocs/requirements.txt
+commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
+
 [testenv:os-requirements]
 commands =
     python {toxinidir}/tools/os-requirements-check.py {envdir}