tests: split up ec2_instance (#979)

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.

Reviewed-by: Mark Chappell <None>

changelogs/fragments/979-ec2_instance_tests_split.yaml

@@ -0,0 +1,3 @@
+---
+trivial:
+- "ec2_instance tests - ec2_instance integration test is now splitted up in several independent tests (https://github.com/ansible-collections/amazon.aws/pull/979)."

tests/integration/targets/ec2_instance_block_devices/aliases

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

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

@@ -0,0 +1,4 @@
+---
+# defaults file for ec2_instance
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-block-devices'

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

@@ -0,0 +1,6 @@
+# this just makes sure they're in the right place
+dependencies:
+- role: setup_ec2_facts
+- role: setup_ec2_instance_env
+  vars:
+    ec2_instance_test_name: block_devices

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
@@ -103,12 +108,3 @@
       - block_device_instances_gp3.spec.BlockDeviceMappings[0].Ebs.VolumeType == 'gp3'
       - block_device_instances_gp3.spec.BlockDeviceMappings[0].Ebs.VolumeSize == 20
       - block_device_instances_gp3.spec.BlockDeviceMappings[0].Ebs.Throughput == 500
-
-  always:
-  - name: "Terminate block_devices instances"
-    ec2_instance:
-      state: absent
-      filters:
-        "tag:TestId": "{{ ec2_instance_tag_TestId }}"
-      wait: yes
-    ignore_errors: yes

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,4 @@
+---
+# defaults file for ec2_instance
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-checkmode'

tests/integration/targets/ec2_instance_checkmode_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_ec2_instance_env
+  vars:
+    ec2_instance_test_name: check_mode

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,4 @@
+---
+# defaults file for ec2_instance
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-cpu-options'

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_ec2_instance_env
+  vars:
+    ec2_instance_test_name: cpu_options

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
@@ -77,12 +83,3 @@
     assert:
       that:
         - "{{ checkmode_instance_fact.instances | length }} == 0"
-
-  always:
-  - name: "Terminate cpu_options instances"
-    ec2_instance:
-      state: absent
-      filters:
-        "tag:TestId": "{{ ec2_instance_tag_TestId }}"
-      wait: yes
-    ignore_errors: yes

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,4 @@
+---
+# defaults file for ec2_instance
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-default-vpc'

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_ec2_instance_env
+  vars:
+    ec2_instance_test_name: default_vpc

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,4 @@
+---
+# defaults file for ec2_instance
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-ebs-optimized'