Keystone jobs should honor upper-constraints.txt

Some targets don't respect upper-constraints like
cover and releasenotes, so make sure don't use
the same install_command for those jobs.

Temporarily add Babel to avoid problem with the
keystone-coverage-db coverage job.

Change-Id: I8636e7c86c6c5c608429fab88e181108ae615db9
This commit is contained in:
Davanum Srinivas
2016-04-17 12:37:04 -04:00
parent c382857e8f
commit db7bdf9aa0
2 changed files with 15 additions and 1 deletions

View File

@@ -2,6 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Temporarily add Babel reference to avoid problem
# in keystone-coverage-db CI job
Babel>=1.3,!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3 # BSD
pbr>=1.6 # Apache-2.0
WebOb>=1.2.3 # MIT
eventlet!=0.18.3,>=0.18.2 # MIT

12
tox.ini
View File

@@ -5,7 +5,7 @@ envlist = py34,py27,pep8,docs,genconfig,releasenotes
[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} {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt
.[ldap,memcache,mongodb]
@@ -60,6 +60,12 @@ deps = .[bandit]
commands = bandit -r keystone -x tests
[testenv:cover]
# Also do not run test_coverage_ext tests while gathering coverage as those
# tests conflict with coverage.
# NOTE(sdague): 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 =
find keystone -type f -name "*.pyc" -delete
python setup.py testr --coverage --testr-args='{posargs}'
@@ -137,6 +143,10 @@ commands=
python setup.py build_sphinx
[testenv:releasenotes]
# NOTE(sdague): 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
[testenv:genconfig]