move ansible.utils out of zuul.d/project-templates.yaml (#1331)

move ansible.utils out of zuul.d/project-templates.yaml
ansible · Feb 1, 2022 · 43b2ef8 · 43b2ef8
1 parent 5ecb924
commit 43b2ef8
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 68 deletions.
diff --git a/zuul.ansible.d/project-templates.yaml b/zuul.ansible.d/project-templates.yaml
@@ -42,3 +42,47 @@
         - ansible-test-sanity-docker-stable-2.12
         - ansible-test-units-openvswitch-python38
         - build-ansible-collection
+
+- project-template:
+    name: ansible-collections-ansible-utils
+    check:
+      jobs: &ansible-collections-ansible-utils-jobs
+        - build-ansible-collection
+        - network-ee-integration-tests-ansible-utils:
+            voting: false
+        - network-ee-integration-tests-ansible-utils-stable-2.12
+        - network-ee-integration-tests-ansible-utils-stable-2.11
+        - network-ee-integration-tests-ansible-utils-stable-2.9
+    gate:
+      queue: integrated
+      jobs: *ansible-collections-ansible-utils-jobs
+
+- project-template:
+    name: ansible-collections-ansible-utils-units
+    check:
+      jobs: &ansible-collections-ansible-utils-units-jobs
+        - ansible-changelog-fragment
+        - ansible-test-sanity-docker-devel
+        - ansible-test-sanity-docker-milestone
+        - ansible-test-sanity-docker-stable-2.9
+        - ansible-test-sanity-docker-stable-2.10
+        - ansible-test-sanity-docker-stable-2.11
+        - ansible-test-sanity-docker-stable-2.12
+        - ansible-test-units-ansible-utils-python27
+        - ansible-test-units-ansible-utils-python36
+        - ansible-test-units-ansible-utils-python37
+        - network-ee-unit-tests:
+            voting: false
+    gate:
+      queue: integrated
+      jobs: *ansible-collections-ansible-utils-units-jobs
+    periodic:
+      jobs:
+        - ansible-test-sanity-docker-devel
+        - ansible-test-sanity-docker-milestone
+        - ansible-test-sanity-docker-stable-2.9
+        - ansible-test-sanity-docker-stable-2.10
+        - ansible-test-sanity-docker-stable-2.11
+        - ansible-test-sanity-docker-stable-2.12
+        - ansible-test-units-ansible-utils-python38
+        - build-ansible-collection
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -211,73 +211,6 @@
         - ansible-test-units-eos-python38
         - build-ansible-collection
 
-- project-template:
-    name: ansible-collections-ansible-utils
-    check:
-      jobs: &ansible-collections-ansible-utils-jobs
-        - build-ansible-collection
-        - network-ee-integration-tests-ansible-utils:
-            voting: false
-        - network-ee-integration-tests-ansible-utils-stable-2.12
-        - network-ee-integration-tests-ansible-utils-stable-2.11
-        - network-ee-integration-tests-ansible-utils-stable-2.9
-    gate:
-      queue: integrated
-      jobs: *ansible-collections-ansible-utils-jobs
-
-- project-template:
-    name: ansible-collections-ansible-utils_no_network-ee
-    check:
-      jobs: &ansible-collections-ansible-utils-jobs_no_network_ee
-        - build-ansible-collection:
-            required-projects:
-              - name: github.com/ansible-collections/ansible.netcommon
-              - name: github.com/ansible-collections/ansible.utils
-    gate:
-      queue: integrated
-      jobs: *ansible-collections-ansible-utils-jobs_no_network_ee
-    periodic:
-      jobs:
-        - ansible-test-sanity-docker-devel
-        - ansible-test-sanity-docker-milestone
-        - ansible-test-sanity-docker-stable-2.9
-        - ansible-test-sanity-docker-stable-2.10
-        - ansible-test-sanity-docker-stable-2.11
-        - ansible-test-sanity-docker-stable-2.12
-        - ansible-test-units-openvswitch-python38
-        - build-ansible-collection
-
-
-- project-template:
-    name: ansible-collections-ansible-utils-units
-    check:
-      jobs: &ansible-collections-ansible-utils-units-jobs
-        - ansible-changelog-fragment
-        - ansible-test-sanity-docker-devel
-        - ansible-test-sanity-docker-milestone
-        - ansible-test-sanity-docker-stable-2.9
-        - ansible-test-sanity-docker-stable-2.10
-        - ansible-test-sanity-docker-stable-2.11
-        - ansible-test-sanity-docker-stable-2.12
-        - ansible-test-units-ansible-utils-python27
-        - ansible-test-units-ansible-utils-python36
-        - ansible-test-units-ansible-utils-python37
-        - network-ee-unit-tests:
-            voting: false
-    gate:
-      queue: integrated
-      jobs: *ansible-collections-ansible-utils-units-jobs
-    periodic:
-      jobs:
-        - ansible-test-sanity-docker-devel
-        - ansible-test-sanity-docker-milestone
-        - ansible-test-sanity-docker-stable-2.9
-        - ansible-test-sanity-docker-stable-2.10
-        - ansible-test-sanity-docker-stable-2.11
-        - ansible-test-sanity-docker-stable-2.12
-        - ansible-test-units-ansible-utils-python38
-        - build-ansible-collection
-
 - project-template:
     name: ansible-collections-cisco-asa-units
     check:

diff --git a/zuul.sf.d/project-templates.yaml b/zuul.sf.d/project-templates.yaml
@@ -1,5 +1,5 @@
 ---
-
+# openvswitch.openvswitch
 - project-template:
     name: ansible-collections-openvswitch-openvswitch-units
     check:
@@ -44,3 +44,56 @@
         - ansible-test-sanity-docker-stable-2.12
         - ansible-test-units-openvswitch-python38
         - build-ansible-collection
+
+# ansible.utils
+- project-template:
+    name: ansible-collections-ansible-utils_no_network-ee
+    check:
+      jobs: &ansible-collections-ansible-utils-jobs_no_network_ee
+        - build-ansible-collection:
+            required-projects:
+              - name: github.com/ansible-collections/ansible.netcommon
+              - name: github.com/ansible-collections/ansible.utils
+    gate:
+      queue: integrated
+      jobs: *ansible-collections-ansible-utils-jobs_no_network_ee
+    periodic:
+      jobs:
+        - ansible-test-sanity-docker-devel
+        - ansible-test-sanity-docker-milestone
+        - ansible-test-sanity-docker-stable-2.9
+        - ansible-test-sanity-docker-stable-2.10
+        - ansible-test-sanity-docker-stable-2.11
+        - ansible-test-sanity-docker-stable-2.12
+        - ansible-test-units-openvswitch-python38
+        - build-ansible-collection
+
+- project-template:
+    name: ansible-collections-ansible-utils-units
+    check:
+      jobs: &ansible-collections-ansible-utils-units-jobs
+        - ansible-changelog-fragment
+        - ansible-test-sanity-docker-devel
+        - ansible-test-sanity-docker-milestone
+        - ansible-test-sanity-docker-stable-2.9
+        - ansible-test-sanity-docker-stable-2.10
+        - ansible-test-sanity-docker-stable-2.11
+        - ansible-test-sanity-docker-stable-2.12
+        - ansible-test-units-ansible-utils-python27
+        - ansible-test-units-ansible-utils-python36
+        - ansible-test-units-ansible-utils-python37
+        - network-ee-unit-tests:
+            voting: false
+    gate:
+      queue: integrated
+      jobs: *ansible-collections-ansible-utils-units-jobs
+    periodic:
+      jobs:
+        - ansible-test-sanity-docker-devel
+        - ansible-test-sanity-docker-milestone
+        - ansible-test-sanity-docker-stable-2.9
+        - ansible-test-sanity-docker-stable-2.10
+        - ansible-test-sanity-docker-stable-2.11
+        - ansible-test-sanity-docker-stable-2.12
+        - ansible-test-units-ansible-utils-python38
+        - build-ansible-collection