rework s3_bucket and ec2_instance tests to make sure they have the right botocore available for tests needing recent botocore

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

@@ -1,3 +1,5 @@
+# this just makes sure they're in the right place
 dependencies:
-- prepare_tests
-- setup_ec2_facts
+- role: setup_botocore_pip
+- role: prepare_tests
+- role: setup_ec2_facts

tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml

@@ -1,5 +1,5 @@
 dependencies:
-- prepare_tests
-- setup_ec2_facts
+- role: prepare_tests
+- role: setup_ec2_facts
 collections:
 - amazon.aws

tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/block_devices.yml

@@ -1,4 +1,9 @@
 - block:
+  - include_role:
+      name: setup_botocore_pip
+    vars:
+      botocore_version: '1.19.27'
+
   - name: "New instance with an extra block device"
     ec2_instance:
       state: running
@@ -93,6 +98,9 @@
       instance_type: "{{ ec2_instance_type }}"
       wait: true
     register: block_device_instances_gp3
+    # Managing Troughput requires botocore >= 1.19.27
+    vars:
+      ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
 
   - assert:
       that:

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

@@ -1,4 +1,3 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
-  - setup_remote_tmp_dir
+  - role: prepare_tests
+  - role: setup_botocore_pip

tests/integration/targets/s3_bucket/roles/s3_bucket/meta/main.yml

@@ -1,4 +1,2 @@
 dependencies:
-  - prepare_tests
-  - setup_ec2
-  - setup_remote_tmp_dir
+  - role: prepare_tests

tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/ownership_controls.yml

@@ -6,26 +6,15 @@
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
   block:
-    - pip:
-        name: virtualenv
-    - set_fact:
-        virtualenv: "{{ remote_tmp_dir }}/virtualenv"
-        virtualenv_command: "{{ ansible_python_interpreter }} -m virtualenv"
-    - set_fact:
-        virtualenv_interpreter: "{{ virtualenv }}/bin/python"
-    - pip:
-        name:
-          - 'boto3>=1.13.0'
-          - 'botocore==1.18.11'
-          - 'coverage<5'
-        virtualenv: '{{ virtualenv }}'
-        virtualenv_command: '{{ virtualenv_command }}'
-        virtualenv_site_packages: no
+    - include_role:
+        name: setup_botocore_pip
+      vars:
+        botocore_version: '1.18.11'
 
     # ============================================================
     - name: Wrap test in virtualenv
       vars:
-        ansible_python_interpreter: "{{ virtualenv }}/bin/python"
+        ansible_python_interpreter: "{{ botocore_virtualenv_interpreter }}"
       block:
         - set_fact:
             local_bucket_name: "{{ bucket_name | hash('md5')}}ownership"
@@ -136,7 +125,3 @@
         name: '{{ local_bucket_name }}'
         state: absent
       ignore_errors: yes
-
-    - file:
-        path: "{{ virtualenv }}"
-        state: absent