Merge "Trove's tox tests should respect upper-constraints.txt" into stable/mitaka5.0.0.0rc25.0.0

1 files changed, 25 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index 2d32d7a2..632e7eb1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
-install_command = pip install -U {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/mitaka} -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = find ./trove -type f -name "*.pyc" -delete
@@ -30,6 +30,12 @@ commands =
 commands = oslo_debug_helper {posargs}
 
 [testenv:cover]
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the cover job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 basepython = python2.7
 commands =
      coverage erase
@@ -41,6 +47,12 @@ commands =
 
 
 [testenv:venv]
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the venv job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 commands = {posargs}
 
 [flake8]
@@ -61,7 +73,19 @@ commands =
   openstack-doc-test --check-build {posargs}
 
 [testenv:publishdocs]
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the publishdocs job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 commands = openstack-doc-test --check-build --publish --force
 
 [testenv:releasenotes]
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the release notes job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html