[test_ec2*] cloud integration test updates

To support parallel cloud test execution, create and provide a random string to
cloud integration tests.  The variable 'resource_prefix' can be used in cloud
roles and during resource cleanup to safely create/destroy cloud-based
resources.

Additional changes include:

 * The roles test_ec2_key and test_ec2_group were updated to use to
 {{resource_prefix}}.

 * Additionally, the Makefile was updated to set resource_prefix to a random
 string.  The Makefile will also use 'resource_prefix' during cloud_cleanup.

 * All test_ec2* roles were updated to add 'setup_ec2' as a role dependency.
This commit is contained in:
James Laska 2014-03-13 09:52:36 -04:00
parent d1753046e0
commit 07dd02c25a
14 changed files with 42 additions and 31 deletions

View file

@ -1,6 +1,11 @@
INVENTORY ?= inventory
VARS_FILE ?= integration_config.yml
# Create a semi-random string for use when testing cloud-based resources
ifndef CLOUD_RESOURCE_PREFIX
CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print 'ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in xrange(8));")
endif
all: non_destructive destructive check_mode test_hash
non_destructive:
@ -21,24 +26,24 @@ cloud: amazon rackspace
cloud_cleanup: amazon_cleanup rackspace_cleanup
amazon_cleanup:
python cleanup_ec2.py -y
python cleanup_ec2.py -y --match="^$(CLOUD_RESOURCE_PREFIX)"
rackspace_cleanup:
@echo "FIXME - cleanup_rax.py not yet implemented"
@#python cleanup_rax.py -y
@# python cleanup_rax.py -y --match="^$(CLOUD_RESOURCE_PREFIX)"
credentials.yml:
@echo "No credentials.yml file found. A file named 'credentials.yml' is needed to provide credentials needed to run cloud tests. See sample 'credentials.template' file."
@exit 1
amazon: credentials.yml
ansible-playbook amazon.yml -i $(INVENTORY) -e @$(VARS_FILE) -e @credentials.yml -v $(TEST_FLAGS) ; \
ansible-playbook amazon.yml -i $(INVENTORY) -e @$(VARS_FILE) -e @credentials.yml -e "resource_prefix=$(CLOUD_RESOURCE_PREFIX)" -v $(TEST_FLAGS) ; \
RC=$$? ; \
make amazon_cleanup ; \
CLOUD_RESOURCE_PREFIX="$(CLOUD_RESOURCE_PREFIX)" make amazon_cleanup ; \
exit $$RC;
rackspace: credentials.yml
ansible-playbook rackspace.yml -i $(INVENTORY) -e @$(VARS_FILE) -e @credentials.yml -v $(TEST_FLAGS) ; \
ansible-playbook rackspace.yml -i $(INVENTORY) -e @$(VARS_FILE) -e @credentials.yml -e "resource_prefix=$(CLOUD_RESOURCE_PREFIX)" -v $(TEST_FLAGS) ; \
RC=$$? ; \
make rackspace_cleanup ; \
CLOUD_RESOURCE_PREFIX="$(CLOUD_RESOURCE_PREFIX)" make rackspace_cleanup ; \
exit $$RC;

View file

@ -15,7 +15,7 @@ def delete_aws_resources(get_func, attr, opts):
for item in get_func():
val = getattr(item, attr)
if re.search(opts.match_re, val):
prompt_and_delete(item, "Delete object with %s=%s? [y/n]: " % (attr, val), opts.assumeyes)
prompt_and_delete(item, "Delete matching %s? [y/n]: " % (item,), opts.assumeyes)
def prompt_and_delete(item, prompt, assumeyes):
if not assumeyes:
@ -23,6 +23,7 @@ def prompt_and_delete(item, prompt, assumeyes):
assert hasattr(item, 'delete'), "Class <%s> has no delete attribute" % item.__class__
if assumeyes:
item.delete()
print ("Deleted %s" % item)
def parse_args():
# Load details from credentials.yml
@ -74,8 +75,11 @@ if __name__ == '__main__':
aws = boto.connect_ec2(aws_access_key_id=opts.ec2_access_key,
aws_secret_access_key=opts.ec2_secret_key)
# Delete matching keys
delete_aws_resources(aws.get_all_key_pairs, 'name', opts)
try:
# Delete matching keys
delete_aws_resources(aws.get_all_key_pairs, 'name', opts)
# Delete matching groups
delete_aws_resources(aws.get_all_security_groups, 'name', opts)
# Delete matching groups
delete_aws_resources(aws.get_all_security_groups, 'name', opts)
except KeyboardInterrupt, e:
print "\nExiting on user command."

View file

@ -0,0 +1,2 @@
---
resource_prefix: 'ansible-testing-'

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,5 +1,5 @@
---
# defaults file for test_ec2_group
ec2_group_name: 'ansible-testing-{{ random_string }}'
ec2_group_name: '{{resource_prefix}}'
ec2_group_description: 'Created by ansible integration tests'

View file

@ -1,3 +1,3 @@
---
# defaults file for test_ec2_key
ec2_key_name: 'ansible-testing-{{ random_string }}'
ec2_key_name: '{{resource_prefix}}'

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2

View file

@ -1,3 +1,3 @@
dependencies:
dependencies:
- prepare_tests
- setup_ec2