diff --git a/tox.ini b/tox.ini index 5c1d7bfa..947f5654 100644 --- a/tox.ini +++ b/tox.ini @@ -137,11 +137,9 @@ deps = commands = {[testenv:ansible]commands} ansible-playbook -i {toxinidir}/tests/inventory \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides.yml \ {toxinidir}/tests/test.yml -vvvv ansible-playbook -i {toxinidir}/tests/inventory \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides.yml \ {toxinidir}/tests/test-swift-functional.yml -vvvv {[testenv:func_logs]commands} @@ -161,12 +159,10 @@ deps = commands = {[testenv:ansible]commands} ansible-playbook -i {toxinidir}/tests/inventory \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides.yml \ -e "swift_pypy_enabled=True" \ {toxinidir}/tests/test.yml -vvvv ansible-playbook -i {toxinidir}/tests/inventory \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides.yml \ -e "swift_pypy_enabled=True" \ {toxinidir}/tests/test-swift-functional.yml -vvvv @@ -189,7 +185,6 @@ commands = # Setup the host and Region A # NB we run against swift_all only since region B hosts don't exist yet. ansible-playbook -i {toxinidir}/tests/inventory_MR_A \ - -e "install_test_packages=True" \ -e "swift_do_setup=True" \ -e "swift_do_sync=False" \ -e "swift_groups='swift_all'" \ @@ -197,24 +192,20 @@ commands = {toxinidir}/tests/test.yml -vvvv # Setup region B Swift only and sync rings. ansible-playbook -i {toxinidir}/tests/inventory_MR_B \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides-MR-B.yml \ {toxinidir}/tests/common/test-install-swift.yml -vvvv # Sync rings from region A ansible-playbook -i {toxinidir}/tests/inventory_MR_A \ - -e "install_test_packages=True" \ -e "swift_do_setup=False" \ -e "swift_do_sync=True" \ -e @{toxinidir}/tests/swift-overrides-MR-A.yml \ {toxinidir}/tests/common/test-install-swift.yml -vvvv # Run functional tests against region A ansible-playbook -i {toxinidir}/tests/inventory_MR_A \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides-MR-A.yml \ {toxinidir}/tests/test-swift-functional.yml -vvvv # Run functional tests against region B ansible-playbook -i {toxinidir}/tests/inventory_MR_B \ - -e "install_test_packages=True" \ -e @{toxinidir}/tests/swift-overrides-MR-B.yml \ {toxinidir}/tests/test-swift-functional.yml -vvvv {[testenv:func_logs]commands}