Merge "Use upper-constraints in tox test environments" into stable/liberty

1 files changed, 9 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index 142c0cca6..89ee21814 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 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/liberty} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1
@@ -66,6 +66,10 @@ commands =
   /bin/bash run_tests.sh -N --makemessages --check-only
 
 [testenv:venv]
+# NOTE(from nova tox.ini by jaegerandi): This target does not use constraints
+# because upstream infra does not yet support it. Once that's fixed, we can
+# drop the install_command.
+install_command = pip install -U --force-reinstall {opts} {packages}
 commands = {posargs}
 
 [testenv:cover]
@@ -97,6 +101,10 @@ setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
 commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
+# NOTE(from nova tox.ini by jaegerandi): This target does not use constraints
+# because upstream infra does not yet support it. Once that's fixed, we can
+# drop the install_command.
+install_command = pip install -U --force-reinstall {opts} {packages}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [tox:jenkins]