Move ansible test requirements into tox.ini
In order to prepare for implementing requirements management by the OpenStack requirements management process, all requirements in requirements.txt and test-requirements.txt need to be in the global-requirements file. As ansible and ansible-lint are not in those files, this patch moves them into explicit deps for the ansible environments in tox.ini. Change-Id: If661d8d5aff86f3bb163624052e41160dd3c9a18
This commit is contained in:
parent
e171e23103
commit
a96fa0b1b6
|
@ -1,5 +1,3 @@
|
|||
ansible-lint>=2.7.0,<3.0.0
|
||||
ansible>=1.9.1,<2.0.0,!=1.9.6
|
||||
bashate>=0.2 # Apache-2.0
|
||||
flake8>=2.5.4,<2.6.0 # MIT
|
||||
|
||||
|
|
12
tox.ini
12
tox.ini
|
@ -95,6 +95,10 @@ commands =
|
|||
|
||||
|
||||
[testenv:ansible]
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
ansible==1.9.4
|
||||
ansible-lint>=2.7.0,<3.0.0
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
ANSIBLE_HOST_KEY_CHECKING = False
|
||||
|
@ -125,6 +129,8 @@ commands =
|
|||
|
||||
|
||||
[testenv:ansible-syntax]
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
{[testenv:ansible]setenv}
|
||||
commands =
|
||||
|
@ -137,6 +143,8 @@ commands =
|
|||
|
||||
|
||||
[testenv:ansible-lint]
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
commands =
|
||||
ansible-lint {toxinidir}
|
||||
|
||||
|
@ -147,6 +155,8 @@ commands =
|
|||
# drop the install_command.
|
||||
install_command =
|
||||
pip install -U --force-reinstall {opts} {packages}
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
{[testenv:ansible]setenv}
|
||||
commands =
|
||||
|
@ -158,6 +168,8 @@ commands =
|
|||
|
||||
|
||||
[testenv:linters]
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
{[testenv:ansible]setenv}
|
||||
commands =
|
||||
|
|
Loading…
Reference in New Issue