Merge "Reduce tox.ini config duplication"
This commit is contained in:
commit
8542040321
15
tox.ini
15
tox.ini
@ -153,14 +153,17 @@ commands =
|
||||
ansible-lint {toxinidir}
|
||||
|
||||
|
||||
[testenv:functional]
|
||||
[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.
|
||||
#
|
||||
# NOTE(automagically): this target tests neutron with linuxbridge
|
||||
install_command =
|
||||
pip install -U --force-reinstall {opts} {packages}
|
||||
|
||||
[testenv:functional]
|
||||
# NOTE(automagically): this target tests neutron with linuxbridge
|
||||
install_command =
|
||||
{[testenv:func_base]install_command}
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
@ -173,13 +176,9 @@ commands =
|
||||
{toxinidir}/tests/test.yml -vvvv
|
||||
|
||||
[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.
|
||||
#
|
||||
# NOTE(automagically): this target tests neutron with ovs
|
||||
install_command =
|
||||
pip install -U --force-reinstall {opts} {packages}
|
||||
{[testenv:func_base]install_command}
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
|
Loading…
x
Reference in New Issue
Block a user