openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Remove install_test_packages variable

Browse Source 
With https://review.openstack.org/381479 merged, setting this
variable in tox.ini via an extra var is unnecessary.

Change-Id: I6041c6235ed95d9a0d3a247ed2d19465ea7e846d
This commit is contained in:
Jesse Pretorius 2016-10-04 11:42:54 +01:00
parent 057b6d525a
commit 465bd050ab
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tox.ini
View File

@ -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}