From cf300da02cb58f88086da4b76e175e2296a1f11c Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 5 May 2015 08:42:07 -0400 Subject: [PATCH] azure changes to Makefile --- test/integration/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/integration/Makefile b/test/integration/Makefile index 28de76c7cd..923a29bc9f 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -105,13 +105,16 @@ test_tags: [ "$$(ansible-playbook --list-tasks --skip-tags tag test_tags.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) | fgrep Task_with | xargs)" = "Task_with_always_tag TAGS: [always] Task_without_tag TAGS: []" ] -cloud: amazon rackspace +cloud: amazon rackspace azure cloud_cleanup: amazon_cleanup rackspace_cleanup amazon_cleanup: python cleanup_ec2.py -y --match="^$(CLOUD_RESOURCE_PREFIX)" +azure_cleanup: + python cleanup_azure.py -y --match="^$(CLOUD_RESOURCE_PREFIX)" + gce_setup: python setup_gce.py "$(CLOUD_RESOURCE_PREFIX)" @@ -131,6 +134,12 @@ amazon: $(CREDENTIALS_FILE) CLOUD_RESOURCE_PREFIX="$(CLOUD_RESOURCE_PREFIX)" make amazon_cleanup ; \ exit $$RC; +azure: $(CREDENTIALS_FILE) + ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook azure.yml -i $(INVENTORY) $(CREDENTIALS_ARG) -e "resource_prefix=$(CLOUD_RESOURCE_PREFIX)" -v $(TEST_FLAGS) ; \ + RC=$$? ; \ + CLOUD_RESOURCE_PREFIX="$(CLOUD_RESOURCE_PREFIX)" make azure_cleanup ; \ + exit $$RC; + gce: $(CREDENTIALS_FILE) CLOUD_RESOURCE_PREFIX="$(CLOUD_RESOURCE_PREFIX)" make gce_setup ; \ ansible-playbook gce.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -e "resource_prefix=$(CLOUD_RESOURCE_PREFIX)" -v $(TEST_FLAGS) ; \