Use upper constraints for all tox targets

With the implementation of https://review.openstack.org/388087 all
tox targets may now use upper constraints.

Change-Id: I1e9dfe8e137e8f7c96ec1e048a3a980334c3eef2
This commit is contained in:
Jesse Pretorius 2016-10-19 07:43:44 +01:00
parent 8980f25c63
commit 935539c8c8

23
tox.ini
View File

@ -103,20 +103,7 @@ commands =
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh" bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
[testenv:func_base]
# NOTE(odyssey4me): this target does not use constraints because
# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
# drop the install_command.
install_command =
pip install -U --force-reinstall {opts} {packages}
[testenv:functional] [testenv:functional]
# NOTE(odyssey4me): this target does not use constraints because
# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
# drop the install_command.
install_command =
{[testenv:func_base]install_command}
deps = deps =
{[testenv:ansible]deps} {[testenv:ansible]deps}
commands = commands =
@ -125,11 +112,6 @@ commands =
[testenv:func_ovs] [testenv:func_ovs]
# NOTE(odyssey4me): this target does not use constraints because
# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
# drop the install_command.
install_command =
{[testenv:func_base]install_command}
deps = deps =
{[testenv:ansible]deps} {[testenv:ansible]deps}
setenv = setenv =
@ -142,11 +124,6 @@ commands =
[testenv:calico] [testenv:calico]
# NOTE(odyssey4me): this target does not use constraints because
# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
# drop the install_command.
install_command =
{[testenv:func_base]install_command}
deps = deps =
{[testenv:ansible]deps} {[testenv:ansible]deps}
setenv = setenv =