Use centralised Ansible test scripts
This patch consumes the centralised Ansible test scripts implemented in https://review.openstack.org/381853 Change-Id: Ia7faf310deabfaea32feb400ca7f8886b5cca7ff
This commit is contained in:
parent
aa995b87d0
commit
6ab8f43a7a
71
tox.ini
71
tox.ini
@ -23,8 +23,10 @@ passenv =
|
|||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
bash
|
bash
|
||||||
setenv =
|
setenv =
|
||||||
|
ANSIBLE_INVENTORY={toxinidir}/tests/lxb_inventory
|
||||||
PYTHONUNBUFFERED=1
|
PYTHONUNBUFFERED=1
|
||||||
ROLE_NAME=os_neutron
|
ROLE_NAME=os_neutron
|
||||||
|
TEST_IDEMPOTENCE=false
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
WORKING_DIR={toxinidir}
|
WORKING_DIR={toxinidir}
|
||||||
|
|
||||||
@ -83,28 +85,22 @@ commands =
|
|||||||
deps =
|
deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
-rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
|
-rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
|
||||||
commands =
|
|
||||||
{[testenv:tests_clone]commands}
|
|
||||||
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:ansible-syntax]
|
[testenv:ansible-syntax]
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv:ansible]commands}
|
{[testenv:tests_clone]commands}
|
||||||
ansible-playbook -i {toxinidir}/tests/lxb_inventory \
|
bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
|
||||||
--syntax-check \
|
|
||||||
--list-tasks \
|
|
||||||
{toxinidir}/tests/test.yml
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:ansible-lint]
|
[testenv:ansible-lint]
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv:ansible]commands}
|
{[testenv:tests_clone]commands}
|
||||||
ansible-lint {toxinidir}
|
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
|
||||||
|
|
||||||
|
|
||||||
[testenv:func_base]
|
[testenv:func_base]
|
||||||
@ -115,60 +111,51 @@ install_command =
|
|||||||
pip install -U --force-reinstall {opts} {packages}
|
pip install -U --force-reinstall {opts} {packages}
|
||||||
|
|
||||||
|
|
||||||
[testenv:func_logs]
|
|
||||||
commands =
|
|
||||||
bash -c "{toxinidir}/tests/common/test-log-collect.sh"
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
# Ignore_errors is set to true so that the logs are collected at the
|
# NOTE(odyssey4me): this target does not use constraints because
|
||||||
# end of the run. This will not produce a false positive. Any
|
# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
|
||||||
# exception will be mark the run as failed and exit 1 after all of
|
# drop the install_command.
|
||||||
# the commands have been iterated through.
|
|
||||||
ignore_errors = True
|
|
||||||
# NOTE(automagically): this target tests neutron with linuxbridge
|
|
||||||
install_command =
|
install_command =
|
||||||
{[testenv:func_base]install_command}
|
{[testenv:func_base]install_command}
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv:ansible]commands}
|
{[testenv:tests_clone]commands}
|
||||||
ansible-playbook -i {toxinidir}/tests/lxb_inventory \
|
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||||
{toxinidir}/tests/test.yml -vvvv
|
|
||||||
{[testenv:func_logs]commands}
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:func_ovs]
|
[testenv:func_ovs]
|
||||||
# Ignore_errors is set to true so that the logs are collected at the
|
# NOTE(odyssey4me): this target does not use constraints because
|
||||||
# end of the run. This will not produce a false positive. Any
|
# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
|
||||||
# exception will be mark the run as failed and exit 1 after all of
|
# drop the install_command.
|
||||||
# the commands have been iterated through.
|
|
||||||
ignore_errors = True
|
|
||||||
# NOTE(automagically): this target tests neutron with ovs
|
|
||||||
install_command =
|
install_command =
|
||||||
{[testenv:func_base]install_command}
|
{[testenv:func_base]install_command}
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
ANSIBLE_INVENTORY={toxinidir}/tests/ovs_inventory
|
||||||
|
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-ovs.yml
|
||||||
commands =
|
commands =
|
||||||
{[testenv:ansible]commands}
|
{[testenv:tests_clone]commands}
|
||||||
ansible-playbook -i {toxinidir}/tests/ovs_inventory \
|
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||||
-e @{toxinidir}/tests/neutron-overrides-ovs.yml \
|
|
||||||
{toxinidir}/tests/test.yml -vvvv
|
|
||||||
{[testenv:func_logs]commands}
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:calico]
|
[testenv:calico]
|
||||||
# NOTE(logan): this target tests neutron with 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 =
|
install_command =
|
||||||
{[testenv:func_base]install_command}
|
{[testenv:func_base]install_command}
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
ANSIBLE_INVENTORY={toxinidir}/tests/calico_inventory
|
||||||
|
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-calico.yml
|
||||||
commands =
|
commands =
|
||||||
{[testenv:ansible]commands}
|
{[testenv:tests_clone]commands}
|
||||||
ansible-playbook -i {toxinidir}/tests/calico_inventory \
|
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||||
-e @{toxinidir}/tests/neutron-overrides-calico.yml \
|
|
||||||
{toxinidir}/tests/test.yml -vvvv
|
|
||||||
{[testenv:func_logs]commands}
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user