Merge pull request #6433 from jlaska/integration_ec2
Always run cleanup after running cloud_integration tests
This commit is contained in:
commit
2d3296d7bd
1 changed files with 17 additions and 4 deletions
|
@ -15,14 +15,27 @@ test_hash:
|
||||||
|
|
||||||
cloud: amazon rackspace
|
cloud: amazon rackspace
|
||||||
|
|
||||||
|
cloud_cleanup: amazon_cleanup rackspace_cleanup
|
||||||
|
|
||||||
|
amazon_cleanup:
|
||||||
|
python cleanup_ec2.py -y
|
||||||
|
|
||||||
|
rackspace_cleanup:
|
||||||
|
@echo "FIXME - cleanup_rax.py not yet implemented"
|
||||||
|
@#python cleanup_rax.py -y
|
||||||
|
|
||||||
credentials.yml:
|
credentials.yml:
|
||||||
@echo "No credentials.yml file found. A file named 'credentials.yml' is needed to provide credentials needed to run cloud tests."
|
@echo "No credentials.yml file found. A file named 'credentials.yml' is needed to provide credentials needed to run cloud tests."
|
||||||
@exit 1
|
@exit 1
|
||||||
|
|
||||||
amazon: credentials.yml
|
amazon: credentials.yml
|
||||||
ansible-playbook amazon.yml -i inventory -e @integration_config.yml -e @credentials.yml -v $(TEST_FLAGS)
|
ansible-playbook amazon.yml -i inventory -e @integration_config.yml -e @credentials.yml -v $(TEST_FLAGS) ; \
|
||||||
@# FIXME - Cleanup won't run if the previous tests fail
|
RC=$$? ; \
|
||||||
python cleanup_ec2.py -y
|
make amazon_cleanup ; \
|
||||||
|
exit $$RC;
|
||||||
|
|
||||||
rackspace: credentials.yml
|
rackspace: credentials.yml
|
||||||
ansible-playbook rackspace.yml -i inventory -e @integration_config.yml -e @credentials.yml -v $(TEST_FLAGS)
|
ansible-playbook rackspace.yml -i inventory -e @integration_config.yml -e @credentials.yml -v $(TEST_FLAGS) ; \
|
||||||
|
RC=$$? ; \
|
||||||
|
make rackspace_cleanup ; \
|
||||||
|
exit $$RC;
|
||||||
|
|
Loading…
Reference in a new issue