Use zuul-cloner for tests repo in OpenStack-CI
When executing the tests repo clone in OpenStack-CI, use zuul-cloner instead of git to enable cross-repo testing. This ensures that if a dependent patch from the tests repo is noted using 'Depends-On: <change-id>' in the commit message, that patch will be included. Change-Id: If382dd9ddd415ca16f144e23b2aceebb301267f8 Depends-On: Idce7abebf32f24c356a27e099fbca954d917402b
This commit is contained in:
committed by
Jesse Pretorius (odyssey4me)
parent
c2bc213e4a
commit
6dc4ecc354
30
tox.ini
30
tox.ini
@@ -54,16 +54,9 @@ commands =
|
||||
{posargs}
|
||||
|
||||
|
||||
[testenv:tests_clone]
|
||||
commands =
|
||||
bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
|
||||
git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
|
||||
fi"
|
||||
|
||||
|
||||
[testenv:pep8]
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-pep8.sh"
|
||||
|
||||
|
||||
@@ -76,7 +69,7 @@ ignore=F403
|
||||
|
||||
[testenv:bashate]
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-bashate.sh"
|
||||
|
||||
|
||||
@@ -90,7 +83,7 @@ deps =
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
|
||||
|
||||
|
||||
@@ -98,7 +91,7 @@ commands =
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
|
||||
|
||||
|
||||
@@ -106,7 +99,7 @@ commands =
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
|
||||
@@ -115,12 +108,9 @@ deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
CLONE_UPGRADE_TESTS=yes
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
|
||||
git clone -b stable/ocata https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||
{toxinidir}/tests/common/previous; \
|
||||
fi"
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/test-neutron-upgrades.sh"
|
||||
|
||||
[testenv:func_ovs]
|
||||
@@ -131,7 +121,7 @@ setenv =
|
||||
ANSIBLE_INVENTORY={toxinidir}/tests/ovs_inventory
|
||||
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-ovs.yml
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
|
||||
@@ -143,7 +133,7 @@ setenv =
|
||||
ANSIBLE_INVENTORY={toxinidir}/tests/calico_inventory
|
||||
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-calico.yml
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
[testenv:dragonflow]
|
||||
@@ -154,7 +144,7 @@ setenv =
|
||||
ANSIBLE_INVENTORY={toxinidir}/tests/dragonflow_inventory
|
||||
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-dragonflow.yml
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user