Remove version specific ec2_instance tests

ansible-collections · Aug 5, 2021 · 6677bcc · 6677bcc
1 parent 6cb8497
commit 6677bcc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 96 deletions.
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -6,3 +6,5 @@ pytest-xdist
 pytest-mock
 # Needed for ansible.netcommon.ipaddr in tests
 netaddr
+# Sometimes needed where we don't have features we need in modules
+awscli
diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt
@@ -1,3 +1,5 @@
 # netaddr is needed for ansible.netcommon.ipv6
 netaddr
 virtualenv
+# Sometimes needed where we don't have features we need in modules
+awscli
diff --git a/tests/integration/targets/ec2_instance/inventory b/tests/integration/targets/ec2_instance/inventory
@@ -1,14 +1,13 @@
 [tests]
 # Sorted fastest to slowest
-version_fail_wrapper
 ebs_optimized
 block_devices
 cpu_options
 default_vpc_tests
 external_resource_attach
 instance_no_wait
 iam_instance_role
-termination_protection_wrapper
+termination_protection
 tags_and_vpc_settings
 checkmode_tests
 security_group

diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/termination_protection.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/termination_protection.yml
@@ -45,7 +45,7 @@
           - "'{{ create_instance_results.spec.DisableApiTermination }}'"
 
     - name: Get info on termination protection
-      command: '{{ aws_cli }} ec2 describe-instance-attribute --attribute disableApiTermination --instance-id {{ instance_id }}'
+      command: 'aws ec2 describe-instance-attribute --attribute disableApiTermination --instance-id {{ instance_id }}'
       environment:
         AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
         AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
@@ -128,7 +128,7 @@
           - "{{ set_termination_protectioncheck_mode_results.changed }}"
 
     - name: Get info on termination protection
-      command: '{{ aws_cli }} ec2 describe-instance-attribute --attribute disableApiTermination --instance-id {{ instance_id }}'
+      command: 'aws ec2 describe-instance-attribute --attribute disableApiTermination --instance-id {{ instance_id }}'
       environment:
         AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
         AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
@@ -161,7 +161,7 @@
           - set_termination_protection_results.changed
 
     - name: Get info on termination protection
-      command: '{{ aws_cli }} ec2 describe-instance-attribute --attribute disableApiTermination --instance-id {{ instance_id }}'
+      command: 'aws ec2 describe-instance-attribute --attribute disableApiTermination --instance-id {{ instance_id }}'
       environment:
         AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
         AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"

diff --git a/...egration/targets/ec2_instance/roles/ec2_instance/tasks/termination_protection_wrapper.yml b/...egration/targets/ec2_instance/roles/ec2_instance/tasks/termination_protection_wrapper.yml
diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/version_fail.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/version_fail.yml
diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/version_fail_wrapper.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/version_fail_wrapper.yml