summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-04 00:07:03 +0000
committerGerrit Code Review <review@openstack.org>2016-04-04 00:07:03 +0000
commit6591af614f186a34ca589fad236e0e2d07f9c1d1 (patch)
tree7d0b3a465c7ca366218c51497ebcd90b3be770fb
parenta571e449178a5b3dbab75129c12175e3aaeb0a09 (diff)
parent0370ee8b34565432d5dca3c2fe7267c1327ca197 (diff)
downloadtrove-6591af614f186a34ca589fad236e0e2d07f9c1d1.tar.gz
Merge "Trove's tox tests should respect upper-constraints.txt" into stable/liberty
-rw-r--r--tox.ini26
1 files changed, 25 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 99d4395c..869d8741 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/liberty} -U {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = {envpython} run_tests.py
@@ -26,6 +26,12 @@ commands =
xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[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 =
{envpython} run_tests.py --group=does_not_exist
@@ -38,6 +44,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]
@@ -58,7 +70,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