Reenable ec2_vol tests

ansible-collections · Aug 31, 2021 · f745df1 · f745df1
1 parent f47abb0
commit f745df1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/tests/integration/targets/ec2_vol/aliases b/tests/integration/targets/ec2_vol/aliases
@@ -1,7 +1,3 @@
-# https://github.com/ansible-collections/amazon.aws/issues/463
-# ec2_vol tests have been unstable failing with various errors at about an error
-# rate of 1 in 3
-disabled
 slow
 
 cloud/aws

diff --git a/tests/integration/targets/ec2_vol/tasks/main.yml b/tests/integration/targets/ec2_vol/tasks/main.yml
@@ -6,9 +6,6 @@
       security_token: '{{ security_token | default(omit) }}'
       region: '{{ aws_region | default(omit) }}'
 
-  vars:
-    ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
-
   collections:
     - amazon.aws
     - community.aws
@@ -389,6 +386,8 @@
           - new_vol_attach_result.volume.tags["Name"] == '{{ resource_prefix }} - sdh'
 
     - name: volume must be from type gp3 (idempotent)
+      vars:
+        ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
       ec2_vol:
         id: "{{ new_vol_attach_result.volume_id }}"
         zone: "{{ availability_zone }}"
@@ -543,6 +542,8 @@
       when: ansible_version.full is version('2.7', '>=')
 
     - name: test create a new gp3 volume
+      vars:
+        ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
       ec2_vol:
         volume_size: 70
         zone: "{{ availability_zone }}"
@@ -574,6 +575,8 @@
           - gp3_volume.volume.tags["ResourcePrefix"] == "{{ resource_prefix }}"
 
     - name: Read volume information to validate throughput
+      vars:
+        ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
       ec2_vol_info:
         filters:
           volume-id: "{{ gp3_volume.volume_id }}"
@@ -591,6 +594,8 @@
         var: vol_facts
 
     - name: Read volume information to validate throughput
+      vars:
+        ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
       ec2_vol_info:
         filters:
           volume-id: "{{ gp3_volume.volume_id }}"
@@ -608,6 +613,8 @@
         var: vol_facts
 
     - name: increase throughput
+      vars:
+        ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
       ec2_vol:
         volume_size: 70
         zone: "{{ availability_zone }}"