Clean up amazon.aws sanity tests

Signed-off-by: Paul Belanger <[email protected]>
ansible · Aug 16, 2021 · ad49699 · ad49699
1 parent 86e77da
commit ad49699
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 38 deletions.
diff --git a/zuul.d/ansible-cloud-jobs.yaml b/zuul.d/ansible-cloud-jobs.yaml
@@ -355,63 +355,49 @@
 
 #### sanity
 - job:
-    name: ansible-test-sanity-aws-ansible
+    name: ansible-test-sanity-aws-ansible-python36
     parent: ansible-test-sanity-docker
-    nodeset: controller-python36
-    dependencies:
-      - name: build-ansible-collection
-        soft: true
-    required-projects:
-      - name: github.com/ansible/ansible
-    timeout: 3600
     vars:
-      ansible_test_collections: true
-      ansible_collections_repo: "{{ zuul.project.canonical_name }}"
-      ansible_test_command: sanity
-      ansible_test_enable_ara: false
-      ansible_test_python: 3.6
       ansible_test_sanity_skiptests:
         - 'future-import-boilerplate'
         - 'metaclass-boilerplate'
 
 - job:
     name: ansible-test-sanity-aws-ansible-2.9-python36
-    parent: ansible-test-sanity-aws-ansible
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
+    parent: ansible-test-sanity-stable-2.9
+    vars:
+      ansible_test_sanity_skiptests:
+        - 'future-import-boilerplate'
+        - 'metaclass-boilerplate'
 
 - job:
     name: ansible-test-sanity-aws-ansible-2.11-python36
-    parent: ansible-test-sanity-aws-ansible
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.11
-
-- job:
-    name: ansible-test-sanity-aws-ansible-devel-python36
-    parent: ansible-test-sanity-aws-ansible
+    parent: ansible-test-sanity-stable-2.11
+    vars:
+      ansible_test_sanity_skiptests:
+        - 'future-import-boilerplate'
+        - 'metaclass-boilerplate'
 
 - job:
-    name: ansible-test-sanity-aws-ansible-devel-python38
-    parent: ansible-test-sanity-aws-ansible
+    name: ansible-test-sanity-aws-ansible-python38
+    parent: ansible-test-sanity-aws-ansible-python36
     nodeset: controller-python38
     vars:
       ansible_test_python: 3.8
 
 - job:
     name: ansible-test-sanity-aws-ansible-2.9-python38
-    parent: ansible-test-sanity-aws-ansible-devel-python38
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
+    parent: ansible-test-sanity-aws-ansible-2.9-python36
+    nodeset: controller-python38
+    vars:
+      ansible_test_python: 3.8
 
 - job:
     name: ansible-test-sanity-aws-ansible-2.11-python38
-    parent: ansible-test-sanity-aws-ansible-devel-python38
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.11
+    parent: ansible-test-sanity-aws-ansible-2.11-python36
+    nodeset: controller-python38
+    vars:
+      ansible_test_python: 3.8
 
 ### Cloud Common
 - job:

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -64,12 +64,12 @@
     check:
       queue: integrated-aws
       jobs: &ansile-collections-amazon-aws-jobs
+        - ansible-test-sanity-aws-ansible-python36
         - ansible-test-sanity-aws-ansible-2.9-python36
-        - ansible-test-sanity-aws-ansible-2.9-python38
         - ansible-test-sanity-aws-ansible-2.11-python36
+        - ansible-test-sanity-aws-ansible-python38
+        - ansible-test-sanity-aws-ansible-2.9-python38
         - ansible-test-sanity-aws-ansible-2.11-python38
-        - ansible-test-sanity-aws-ansible-devel-python36
-        - ansible-test-sanity-aws-ansible-devel-python38
         - ansible-test-units-amazon-aws-python38
         - build-ansible-collection:
             required-projects: