Revert "aws: introduce ansible-test-splitter job (ansible#978)"

This reverts commit c3d89eb.
jillr · Jul 30, 2021 · 384bc5c · 384bc5c
1 parent b0421ed
commit 384bc5c
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 254 deletions.
diff --git a/playbooks/ansible-test-splitter/run.yaml b/playbooks/ansible-test-splitter/run.yaml
diff --git a/roles/ansible-test-splitter/defaults/main.yaml b/roles/ansible-test-splitter/defaults/main.yaml
diff --git a/roles/ansible-test-splitter/files/split_targets.py b/roles/ansible-test-splitter/files/split_targets.py
diff --git a/roles/ansible-test-splitter/files/test_changed.py b/roles/ansible-test-splitter/files/test_changed.py
diff --git a/roles/ansible-test-splitter/tasks/ansible_test_changed.yaml b/roles/ansible-test-splitter/tasks/ansible_test_changed.yaml
diff --git a/roles/ansible-test-splitter/tasks/main.yaml b/roles/ansible-test-splitter/tasks/main.yaml
diff --git a/roles/ansible-test-splitter/tasks/split_targets.yaml b/roles/ansible-test-splitter/tasks/split_targets.yaml
diff --git a/zuul.d/ansible-cloud-jobs.yaml b/zuul.d/ansible-cloud-jobs.yaml
@@ -259,30 +259,12 @@
 
 
 ### AWS
-- job:
-    name: ansible-test-splitter
-    run: playbooks/ansible-test-splitter/run.yaml
-    nodeset: controller-python36-f34
-    required-projects:
-      - name: github.com/ansible/ansible
-    timeout: 1000
-    vars:
-      ansible_collections_repo: "{{ zuul.project.canonical_name }}"
-      ansible_test_location: "{{ ansible_user_dir }}/{{ zuul.projects[zuul.project.canonical_name].src_dir }}"
-      ansible_test_splitter__test_changed: true
-      ansible_test_splitter__children_prefix: ansible-test-cloud-integration-aws-py36_
-
-- semaphore:
-    name: ansible-test-cloud-integration-aws
-    max: 6
-
 - job:
     name: ansible-test-cloud-integration-aws-py36
     parent: ansible-core-ci-aws-session
     nodeset: controller-python36-f34
     dependencies:
       - name: build-ansible-collection
-      - name: ansible-test-splitter
     pre-run:
       - playbooks/ansible-test-base/pre.yaml
       - playbooks/ansible-cloud/aws/pre.yaml
@@ -298,68 +280,45 @@
       ansible_test_command: integration
       ansible_test_enable_ara: false
       ansible_test_python: 3.6
-      ansible_test_retry_on_error: true
-    semaphore: ansible-test-cloud-integration-aws
-
-- job:
-    name: ansible-test-cloud-integration-aws-py36_0
-    parent: ansible-test-cloud-integration-aws-py36
-    vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[0]|join(' ') }}"
+      ansible_test_changed: true
+      ansible_test_split_in: 6
 
 - job:
-    name: ansible-test-cloud-integration-aws-py36_1
+    name: ansible-test-cloud-integration-aws-py36_1_of_6
     parent: ansible-test-cloud-integration-aws-py36
     vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[1]|join(' ') }}"
-
-- job:
-    name: ansible-test-cloud-integration-aws-py36_2
-    parent: ansible-test-cloud-integration-aws-py36
-    vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[2]|join(' ') }}"
-
-- job:
-    name: ansible-test-cloud-integration-aws-py36_3
-    parent: ansible-test-cloud-integration-aws-py36
-    vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[3]|join(' ') }}"
+      ansible_test_do_number: 1
 
 - job:
-    name: ansible-test-cloud-integration-aws-py36_4
+    name: ansible-test-cloud-integration-aws-py36_2_of_6
     parent: ansible-test-cloud-integration-aws-py36
     vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[4]|join(' ') }}"
+      ansible_test_do_number: 2
 
 - job:
-    name: ansible-test-cloud-integration-aws-py36_5
+    name: ansible-test-cloud-integration-aws-py36_3_of_6
     parent: ansible-test-cloud-integration-aws-py36
     vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[5]|join(' ') }}"
+      ansible_test_do_number: 3
 
 - job:
-    name: ansible-test-cloud-integration-aws-py36_6
+    name: ansible-test-cloud-integration-aws-py36_4_of_6
     parent: ansible-test-cloud-integration-aws-py36
     vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[6]|join(' ') }}"
+      ansible_test_do_number: 4
 
 - job:
-    name: ansible-test-cloud-integration-aws-py36_7
+    name: ansible-test-cloud-integration-aws-py36_5_of_6
     parent: ansible-test-cloud-integration-aws-py36
     vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[7]|join(' ') }}"
+      ansible_test_do_number: 5
 
 - job:
-    name: ansible-test-cloud-integration-aws-py36_8
+    name: ansible-test-cloud-integration-aws-py36_6_of_6
     parent: ansible-test-cloud-integration-aws-py36
     vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[8]|join(' ') }}"
+      ansible_test_do_number: 6
 
-- job:
-    name: ansible-test-cloud-integration-aws-py36_9
-    parent: ansible-test-cloud-integration-aws-py36
-    vars:
-      ansible_test_integration_targets: "{{ child.targets_to_test[9]|join(' ') }}"
 #### units
 - job:
     name: ansible-test-units-community-aws-python38

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -76,18 +76,12 @@
               - name: github.com/ansible-collections/ansible.netcommon
               - name: github.com/ansible-collections/community.aws
               - name: github.com/ansible-collections/community.general
-        - ansible-test-splitter
-        - ansible-test-cloud-integration-aws-py36_0
-        - ansible-test-cloud-integration-aws-py36_1
-        - ansible-test-cloud-integration-aws-py36_2
-        - ansible-test-cloud-integration-aws-py36_3
-        - ansible-test-cloud-integration-aws-py36_4
-        - ansible-test-cloud-integration-aws-py36_5
-        - ansible-test-cloud-integration-aws-py36_6
-        - ansible-test-cloud-integration-aws-py36_7
-        - ansible-test-cloud-integration-aws-py36_8
-        - ansible-test-cloud-integration-aws-py36_9
-
+        - ansible-test-cloud-integration-aws-py36_1_of_6
+        - ansible-test-cloud-integration-aws-py36_2_of_6
+        - ansible-test-cloud-integration-aws-py36_3_of_6
+        - ansible-test-cloud-integration-aws-py36_4_of_6
+        - ansible-test-cloud-integration-aws-py36_5_of_6
+        - ansible-test-cloud-integration-aws-py36_6_of_6
     gate:
       jobs:
         - ansible-test-sanity-aws-ansible-2.9-python36
@@ -103,17 +97,12 @@
               - name: github.com/ansible-collections/ansible.netcommon
               - name: github.com/ansible-collections/community.aws
               - name: github.com/ansible-collections/community.general
-        - ansible-test-splitter
-        - ansible-test-cloud-integration-aws-py36_0
-        - ansible-test-cloud-integration-aws-py36_1
-        - ansible-test-cloud-integration-aws-py36_2
-        - ansible-test-cloud-integration-aws-py36_3
-        - ansible-test-cloud-integration-aws-py36_4
-        - ansible-test-cloud-integration-aws-py36_5
-        - ansible-test-cloud-integration-aws-py36_6
-        - ansible-test-cloud-integration-aws-py36_7
-        - ansible-test-cloud-integration-aws-py36_8
-        - ansible-test-cloud-integration-aws-py36_9
+        - ansible-test-cloud-integration-aws-py36_1_of_6
+        - ansible-test-cloud-integration-aws-py36_2_of_6
+        - ansible-test-cloud-integration-aws-py36_3_of_6
+        - ansible-test-cloud-integration-aws-py36_4_of_6
+        - ansible-test-cloud-integration-aws-py36_5_of_6
+        - ansible-test-cloud-integration-aws-py36_6_of_6
 
 - project-template:
     name: ansible-collections-community-aws
@@ -130,17 +119,12 @@
               - name: github.com/ansible-collections/ansible.netcommon
               - name: github.com/ansible-collections/ansible.utils
               - name: github.com/ansible-collections/community.general
-        - ansible-test-splitter
-        - ansible-test-cloud-integration-aws-py36_0
-        - ansible-test-cloud-integration-aws-py36_1
-        - ansible-test-cloud-integration-aws-py36_2
-        - ansible-test-cloud-integration-aws-py36_3
-        - ansible-test-cloud-integration-aws-py36_4
-        - ansible-test-cloud-integration-aws-py36_5
-        - ansible-test-cloud-integration-aws-py36_6
-        - ansible-test-cloud-integration-aws-py36_7
-        - ansible-test-cloud-integration-aws-py36_8
-        - ansible-test-cloud-integration-aws-py36_9
+        - ansible-test-cloud-integration-aws-py36_1_of_6
+        - ansible-test-cloud-integration-aws-py36_2_of_6
+        - ansible-test-cloud-integration-aws-py36_3_of_6
+        - ansible-test-cloud-integration-aws-py36_4_of_6
+        - ansible-test-cloud-integration-aws-py36_5_of_6
+        - ansible-test-cloud-integration-aws-py36_6_of_6
         - ansible-galaxy-importer:
             voting: false
     gate:
@@ -156,17 +140,12 @@
               - name: github.com/ansible-collections/ansible.netcommon
               - name: github.com/ansible-collections/ansible.utils
               - name: github.com/ansible-collections/community.general
-        - ansible-test-splitter
-        - ansible-test-cloud-integration-aws-py36_0
-        - ansible-test-cloud-integration-aws-py36_1
-        - ansible-test-cloud-integration-aws-py36_2
-        - ansible-test-cloud-integration-aws-py36_3
-        - ansible-test-cloud-integration-aws-py36_4
-        - ansible-test-cloud-integration-aws-py36_5
-        - ansible-test-cloud-integration-aws-py36_6
-        - ansible-test-cloud-integration-aws-py36_7
-        - ansible-test-cloud-integration-aws-py36_8
-        - ansible-test-cloud-integration-aws-py36_9
+        - ansible-test-cloud-integration-aws-py36_1_of_6
+        - ansible-test-cloud-integration-aws-py36_2_of_6
+        - ansible-test-cloud-integration-aws-py36_3_of_6
+        - ansible-test-cloud-integration-aws-py36_4_of_6
+        - ansible-test-cloud-integration-aws-py36_5_of_6
+        - ansible-test-cloud-integration-aws-py36_6_of_6
         - ansible-galaxy-importer:
             voting: false