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.
ansible-collections · Aug 25, 2022 · 2cb7bd4 · 2cb7bd4
1 parent 9e7ae6c
commit 2cb7bd4
Show file tree

Hide file tree

Showing 81 changed files with 573 additions and 132 deletions.
diff --git a/tests/integration/targets/ec2_instance/inventory b/tests/integration/targets/ec2_instance/inventory
diff --git a/tests/integration/targets/ec2_instance/main.yml b/tests/integration/targets/ec2_instance/main.yml
diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance/runme.sh b/tests/integration/targets/ec2_instance/runme.sh
diff --git a/.../integration/targets/ec2_instance/aliases → ...argets/ec2_instance_block_devices/aliases b/.../integration/targets/ec2_instance/aliases → ...argets/ec2_instance_block_devices/aliases
@@ -1,5 +1,5 @@
-# duration: 25
-slow
 
 cloud/aws
 ec2_instance_info
+ec2_instance
+
diff --git a/...ance/roles/ec2_instance/defaults/main.yml → ..._instance_block_devices/defaults/main.yml b/...ance/roles/ec2_instance/defaults/main.yml → ..._instance_block_devices/defaults/main.yml
diff --git a/...ration/targets/ec2_instance/meta/main.yml → .../ec2_instance_block_devices/meta/main.yml b/...ration/targets/ec2_instance/meta/main.yml → .../ec2_instance_block_devices/meta/main.yml
diff --git a/...oles/ec2_instance/tasks/block_devices.yml → ...ec2_instance_block_devices/tasks/main.yml b/...oles/ec2_instance/tasks/block_devices.yml → ...ec2_instance_block_devices/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_checkmode_tests/aliases b/tests/integration/targets/ec2_instance_checkmode_tests/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_checkmode_tests/defaults/main.yml b/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') }}"
diff --git a/...instance/roles/ec2_instance/meta/main.yml → ...c2_instance_checkmode_tests/meta/main.yml b/...instance/roles/ec2_instance/meta/main.yml → ...c2_instance_checkmode_tests/meta/main.yml
@@ -1,7 +1,6 @@
+# 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"
-collections:
-- amazon.aws
diff --git a/...es/ec2_instance/tasks/checkmode_tests.yml → ...2_instance_checkmode_tests/tasks/main.yml b/...es/ec2_instance/tasks/checkmode_tests.yml → ...2_instance_checkmode_tests/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_cpu_options/aliases b/tests/integration/targets/ec2_instance_cpu_options/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_cpu_options/defaults/main.yml b/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') }}"
diff --git a/tests/integration/targets/ec2_instance_cpu_options/meta/main.yml b/tests/integration/targets/ec2_instance_cpu_options/meta/main.yml
@@ -0,0 +1,6 @@
+# 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"
diff --git a/.../roles/ec2_instance/tasks/cpu_options.yml → ...s/ec2_instance_cpu_options/tasks/main.yml b/.../roles/ec2_instance/tasks/cpu_options.yml → ...s/ec2_instance_cpu_options/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_default_vpc_tests/aliases b/tests/integration/targets/ec2_instance_default_vpc_tests/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_default_vpc_tests/defaults/main.yml b/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') }}"
diff --git a/tests/integration/targets/ec2_instance_default_vpc_tests/meta/main.yml b/tests/integration/targets/ec2_instance_default_vpc_tests/meta/main.yml
@@ -0,0 +1,6 @@
+# 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"
diff --git a/.../ec2_instance/tasks/default_vpc_tests.yml → ...instance_default_vpc_tests/tasks/main.yml b/.../ec2_instance/tasks/default_vpc_tests.yml → ...instance_default_vpc_tests/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_ebs_optimized/aliases b/tests/integration/targets/ec2_instance_ebs_optimized/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_ebs_optimized/defaults/main.yml b/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') }}"
diff --git a/tests/integration/targets/ec2_instance_ebs_optimized/meta/main.yml b/tests/integration/targets/ec2_instance_ebs_optimized/meta/main.yml
@@ -0,0 +1,6 @@
+# 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"
diff --git a/...oles/ec2_instance/tasks/ebs_optimized.yml → ...ec2_instance_ebs_optimized/tasks/main.yml b/...oles/ec2_instance/tasks/ebs_optimized.yml → ...ec2_instance_ebs_optimized/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_env_cleanup/aliases b/tests/integration/targets/ec2_instance_env_cleanup/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_env_cleanup/defaults/main.yml b/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') }}"
diff --git a/tests/integration/targets/ec2_instance_env_cleanup/meta/main.yml b/tests/integration/targets/ec2_instance_env_cleanup/meta/main.yml
@@ -0,0 +1,6 @@
+# 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"
diff --git a/.../roles/ec2_instance/tasks/env_cleanup.yml → ...s/ec2_instance_env_cleanup/tasks/main.yml b/.../roles/ec2_instance/tasks/env_cleanup.yml → ...s/ec2_instance_env_cleanup/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_env_setup/aliases b/tests/integration/targets/ec2_instance_env_setup/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_env_setup/defaults/main.yml b/tests/integration/targets/ec2_instance_env_setup/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') }}"
diff --git a/tests/integration/targets/ec2_instance_env_setup/meta/main.yml b/tests/integration/targets/ec2_instance_env_setup/meta/main.yml
@@ -0,0 +1,6 @@
+# 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"
diff --git a/...ce/roles/ec2_instance/tasks/env_setup.yml → ...ets/ec2_instance_env_setup/tasks/main.yml b/...ce/roles/ec2_instance/tasks/env_setup.yml → ...ets/ec2_instance_env_setup/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_external_resource_attach/aliases b/tests/integration/targets/ec2_instance_external_resource_attach/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+
diff --git a/tests/integration/targets/ec2_instance_external_resource_attach/defaults/main.yml b/tests/integration/targets/ec2_instance_external_resource_attach/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') }}"
diff --git a/tests/integration/targets/ec2_instance_external_resource_attach/meta/main.yml b/tests/integration/targets/ec2_instance_external_resource_attach/meta/main.yml
@@ -0,0 +1,6 @@
+# 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"
diff --git a/...stance/tasks/external_resource_attach.yml → ...e_external_resource_attach/tasks/main.yml b/...stance/tasks/external_resource_attach.yml → ...e_external_resource_attach/tasks/main.yml
diff --git a/tests/integration/targets/ec2_instance_find_ami/aliases b/tests/integration/targets/ec2_instance_find_ami/aliases
@@ -0,0 +1,5 @@
+
+cloud/aws
+ec2_instance_info
+ec2_instance
+