tests: split up ec2_instance

Use on target per sub-test to have a better control on the global execution
time and simplify the troubleshooting.

tests/integration/targets/ec2_instance/aliases → tests/integration/targets/ec2_instance_block_devices/aliases

@@ -1,5 +1,5 @@
-# duration: 25
-slow
 
 cloud/aws
 ec2_instance_info
+ec2_instance
+

tests/integration/targets/ec2_instance/meta/main.yml → tests/integration/targets/ec2_instance_block_devices/meta/main.yml

@@ -3,4 +3,5 @@ dependencies:
 - role: setup_ec2_facts
 - role: setup_botocore_pip
   vars:
-    boto3_version: "1.20.30"
+    boto3_version: 1.20.30
+- role: setup_ec2_instance_env

tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/block_devices.yml → tests/integration/targets/ec2_instance_block_devices/tasks/main.yml

@@ -1,5 +1,10 @@
-- block:
-
+- module_defaults:
+    group/aws:
+      aws_access_key: "{{ aws_access_key }}"
+      aws_secret_key: "{{ aws_secret_key }}"
+      security_token: "{{ security_token | default(omit) }}"
+      region: "{{ aws_region }}"
+  block:
   - name: "New instance with an extra block device"
     ec2_instance:
       state: running

tests/integration/targets/ec2_instance_checkmode_tests/aliases

@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+

tests/integration/targets/ec2_instance_checkmode_tests/defaults/main.yml

@@ -0,0 +1,21 @@
+---
+# defaults file for ec2_instance
+ec2_instance_owner: 'integration-run-{{ resource_prefix }}'
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ inventory_hostname }}'
+
+vpc_name: '{{ resource_prefix }}-vpc'
+vpc_seed: '{{ resource_prefix }}'
+vpc_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.0.0/16'
+
+subnet_a_az: '{{ ec2_availability_zone_names[0] }}'
+subnet_a_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.32.0/24'
+subnet_a_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.32.'
+subnet_b_az: '{{ ec2_availability_zone_names[1] }}'
+subnet_b_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.33.0/24'
+subnet_b_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.33.'
+
+first_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy"
+second_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy-2"
+# Zuul resource prefixes are very long, and IAM roles can only be 64 characters
+unique_id: "{{ resource_prefix | hash('md5') }}"

tests/integration/targets/ec2_instance_checkmode_tests/meta/main.yml

@@ -0,0 +1,7 @@
+# this just makes sure they're in the right place
+dependencies:
+- role: setup_ec2_facts
+- role: setup_botocore_pip
+  vars:
+    boto3_version: 1.20.30
+- role: setup_ec2_instance_env

tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/checkmode_tests.yml → tests/integration/targets/ec2_instance_checkmode_tests/tasks/main.yml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      aws_access_key: "{{ aws_access_key }}"
+      aws_secret_key: "{{ aws_secret_key }}"
+      security_token: "{{ security_token | default(omit) }}"
+      region: "{{ aws_region }}"
+  block:
   - name: "Make basic instance"
     ec2_instance:
       state: present

tests/integration/targets/ec2_instance_cpu_options/aliases

@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+

tests/integration/targets/ec2_instance_cpu_options/defaults/main.yml

@@ -0,0 +1,21 @@
+---
+# defaults file for ec2_instance
+ec2_instance_owner: 'integration-run-{{ resource_prefix }}'
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ inventory_hostname }}'
+
+vpc_name: '{{ resource_prefix }}-vpc'
+vpc_seed: '{{ resource_prefix }}'
+vpc_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.0.0/16'
+
+subnet_a_az: '{{ ec2_availability_zone_names[0] }}'
+subnet_a_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.32.0/24'
+subnet_a_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.32.'
+subnet_b_az: '{{ ec2_availability_zone_names[1] }}'
+subnet_b_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.33.0/24'
+subnet_b_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.33.'
+
+first_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy"
+second_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy-2"
+# Zuul resource prefixes are very long, and IAM roles can only be 64 characters
+unique_id: "{{ resource_prefix | hash('md5') }}"

tests/integration/targets/ec2_instance_cpu_options/meta/main.yml

@@ -0,0 +1,7 @@
+# this just makes sure they're in the right place
+dependencies:
+- role: setup_ec2_facts
+- role: setup_botocore_pip
+  vars:
+    boto3_version: 1.20.30
+- role: setup_ec2_instance_env

tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/cpu_options.yml → tests/integration/targets/ec2_instance_cpu_options/tasks/main.yml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      aws_access_key: "{{ aws_access_key }}"
+      aws_secret_key: "{{ aws_secret_key }}"
+      security_token: "{{ security_token | default(omit) }}"
+      region: "{{ aws_region }}"
+  block:
   - name: "create t3.nano instance with cpu_options"
     ec2_instance:
       state: present

tests/integration/targets/ec2_instance_default_vpc_tests/aliases

@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+

tests/integration/targets/ec2_instance_default_vpc_tests/defaults/main.yml

@@ -0,0 +1,21 @@
+---
+# defaults file for ec2_instance
+ec2_instance_owner: 'integration-run-{{ resource_prefix }}'
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ inventory_hostname }}'
+
+vpc_name: '{{ resource_prefix }}-vpc'
+vpc_seed: '{{ resource_prefix }}'
+vpc_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.0.0/16'
+
+subnet_a_az: '{{ ec2_availability_zone_names[0] }}'
+subnet_a_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.32.0/24'
+subnet_a_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.32.'
+subnet_b_az: '{{ ec2_availability_zone_names[1] }}'
+subnet_b_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.33.0/24'
+subnet_b_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.33.'
+
+first_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy"
+second_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy-2"
+# Zuul resource prefixes are very long, and IAM roles can only be 64 characters
+unique_id: "{{ resource_prefix | hash('md5') }}"

tests/integration/targets/ec2_instance_default_vpc_tests/meta/main.yml

@@ -0,0 +1,7 @@
+# this just makes sure they're in the right place
+dependencies:
+- role: setup_ec2_facts
+- role: setup_botocore_pip
+  vars:
+    boto3_version: 1.20.30
+- role: setup_ec2_instance_env

tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/default_vpc_tests.yml → tests/integration/targets/ec2_instance_default_vpc_tests/tasks/main.yml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      aws_access_key: "{{ aws_access_key }}"
+      aws_secret_key: "{{ aws_secret_key }}"
+      security_token: "{{ security_token | default(omit) }}"
+      region: "{{ aws_region }}"
+  block:
   - name: "Make instance in a default subnet of the VPC"
     ec2_instance:
       state: present

tests/integration/targets/ec2_instance_ebs_optimized/aliases

@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+

tests/integration/targets/ec2_instance_ebs_optimized/defaults/main.yml

@@ -0,0 +1,21 @@
+---
+# defaults file for ec2_instance
+ec2_instance_owner: 'integration-run-{{ resource_prefix }}'
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ inventory_hostname }}'
+
+vpc_name: '{{ resource_prefix }}-vpc'
+vpc_seed: '{{ resource_prefix }}'
+vpc_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.0.0/16'
+
+subnet_a_az: '{{ ec2_availability_zone_names[0] }}'
+subnet_a_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.32.0/24'
+subnet_a_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.32.'
+subnet_b_az: '{{ ec2_availability_zone_names[1] }}'
+subnet_b_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.33.0/24'
+subnet_b_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.33.'
+
+first_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy"
+second_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy-2"
+# Zuul resource prefixes are very long, and IAM roles can only be 64 characters
+unique_id: "{{ resource_prefix | hash('md5') }}"

tests/integration/targets/ec2_instance_ebs_optimized/meta/main.yml

@@ -0,0 +1,7 @@
+# this just makes sure they're in the right place
+dependencies:
+- role: setup_ec2_facts
+- role: setup_botocore_pip
+  vars:
+    boto3_version: 1.20.30
+- role: setup_ec2_instance_env

tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/ebs_optimized.yml → tests/integration/targets/ec2_instance_ebs_optimized/tasks/main.yml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      aws_access_key: "{{ aws_access_key }}"
+      aws_secret_key: "{{ aws_secret_key }}"
+      security_token: "{{ security_token | default(omit) }}"
+      region: "{{ aws_region }}"
+  block:
   - name: "Make EBS optimized instance in the testing subnet of the test VPC"
     ec2_instance:
       state: present

tests/integration/targets/ec2_instance_env_cleanup/aliases

@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+

tests/integration/targets/ec2_instance_env_cleanup/defaults/main.yml

@@ -0,0 +1,21 @@
+---
+# defaults file for ec2_instance
+ec2_instance_owner: 'integration-run-{{ resource_prefix }}'
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ inventory_hostname }}'
+
+vpc_name: '{{ resource_prefix }}-vpc'
+vpc_seed: '{{ resource_prefix }}'
+vpc_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.0.0/16'
+
+subnet_a_az: '{{ ec2_availability_zone_names[0] }}'
+subnet_a_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.32.0/24'
+subnet_a_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.32.'
+subnet_b_az: '{{ ec2_availability_zone_names[1] }}'
+subnet_b_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.33.0/24'
+subnet_b_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.33.'
+
+first_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy"
+second_iam_role: "ansible-test-sts-{{ resource_prefix | hash('md5') }}-test-policy-2"
+# Zuul resource prefixes are very long, and IAM roles can only be 64 characters
+unique_id: "{{ resource_prefix | hash('md5') }}"

tests/integration/targets/ec2_instance_env_cleanup/meta/main.yml

@@ -0,0 +1,7 @@
+# this just makes sure they're in the right place
+dependencies:
+- role: setup_ec2_facts
+- role: setup_botocore_pip
+  vars:
+    boto3_version: 1.20.30
+- role: setup_ec2_instance_env