From 4ccd0785a7ef6b636e102f3e4093430c3a5e90cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@lebouder.net>
Date: Wed, 2 Feb 2022 10:28:43 -0500
Subject: [PATCH] sf/ansible-utils: define the ansible-ee jobs

---
 playbooks/ansible-ee/pre-integration.yaml |  4 +++
 zuul.ansible.d/project-templates.yaml     |  2 ++
 zuul.d/ansible-utils-jobs.yaml            | 40 +++++++++++++++++++++++
 zuul.sf.d/project-templates.yaml          | 36 ++++++++------------
 4 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/playbooks/ansible-ee/pre-integration.yaml b/playbooks/ansible-ee/pre-integration.yaml
index 16ad1c52f..95cfb2f3e 100644
--- a/playbooks/ansible-ee/pre-integration.yaml
+++ b/playbooks/ansible-ee/pre-integration.yaml
@@ -111,6 +111,10 @@
           image: "{{ container_image_name}}:to-test"
         mode: stdout
 
+- name: Print ansible-navigator.cfg
+  debug:
+    msg: "{{ _navigator_data | to_nice_yaml(indent=2, explicit_start=True) }}"
+
 - name: Write ansible-navigator.cfg file
   copy:
     content: "{{ _navigator_data | to_nice_yaml(indent=2, explicit_start=True) }}"
diff --git a/zuul.ansible.d/project-templates.yaml b/zuul.ansible.d/project-templates.yaml
index 4c9bd76cf..befca1782 100644
--- a/zuul.ansible.d/project-templates.yaml
+++ b/zuul.ansible.d/project-templates.yaml
@@ -1,4 +1,5 @@
 ---
+# openvswitch.openvswitch
 - project-template:
     name: ansible-collections-openvswitch-openvswitch-units
     check:
@@ -43,6 +44,7 @@
         - ansible-test-units-openvswitch-python38
         - build-ansible-collection
 
+# ansible.utils
 - project-template:
     name: ansible-collections-ansible-utils
     check:
diff --git a/zuul.d/ansible-utils-jobs.yaml b/zuul.d/ansible-utils-jobs.yaml
index 78d1e4f77..3d5d00751 100644
--- a/zuul.d/ansible-utils-jobs.yaml
+++ b/zuul.d/ansible-utils-jobs.yaml
@@ -85,3 +85,43 @@
       test_ansible_python_interpreter: /usr/bin/python3
       collection_name: utils
       collection_namespace: ansible
+
+# ansible-ee
+- job:
+    name: ansible-ee-integration-ansible-utils-latest
+    parent: ansible-ee-tests
+    vars:
+      ansible_runner_container_version: latest
+      container_image_tests:
+        - integration
+      ansible_network_os: openvswitch
+      test_ansible_ssh_private_key_file: ~/.ssh/id_ecdsa
+      test_ansible_network_cli_ssh_type: libssh
+      test_ansible_python_interpreter: /usr/bin/python3
+      collection_name: utils
+      collection_namespace: ansible
+    nodeset: openvswitch-2.15.0-python38
+
+- job:
+    name: ansible-ee-integration-ansible-utils-stable2.11
+    parent: ansible-ee-integration-ansible-utils-latest
+    vars:
+      ansible_runner_container_version: stable-2.11-devel
+
+- job:
+    name: ansible-ee-integration-ansible-utils-stable2.12
+    parent: ansible-ee-integration-ansible-utils-latest
+    vars:
+      ansible_runner_container_version: stable-2.12-devel
+
+- job:
+    name: ansible-ee-integration-ansible-utils-stable2.10
+    parent: ansible-ee-integration-ansible-utils-latest
+    vars:
+      ansible_runner_container_version: stable-2.10-devel
+
+- job:
+    name: ansible-ee-integration-ansible-utils-stable2.9
+    parent: ansible-ee-integration-ansible-utils-latest
+    vars:
+      ansible_runner_container_version: stable-2.9-devel
diff --git a/zuul.sf.d/project-templates.yaml b/zuul.sf.d/project-templates.yaml
index f58a72701..3aa3270cf 100644
--- a/zuul.sf.d/project-templates.yaml
+++ b/zuul.sf.d/project-templates.yaml
@@ -47,34 +47,21 @@
 
 # ansible.utils
 - project-template:
-    name: ansible-collections-ansible-utils_no_network-ee
+    name: ansible-collections-ansible-utils
     check:
-      jobs: &ansible-collections-ansible-utils-jobs_no_network_ee
+      jobs: &ansible-collections-ansible-utils-jobs
         - build-ansible-collection:
             required-projects:
               - name: github.com/ansible-collections/ansible.netcommon
               - name: github.com/ansible-collections/ansible.utils
+        - ansible-ee-integration-ansible-utils-latest
+        - ansible-ee-integration-ansible-utils-stable2.11
+        - ansible-ee-integration-ansible-utils-stable2.12
+        - ansible-ee-integration-ansible-utils-stable2.10
+        - ansible-ee-integration-ansible-utils-stable2.9
     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
-    check:
-      jobs: []
-    gate:
-      queue: integrated
-      jobs: []
+      jobs: *ansible-collections-ansible-utils-jobs
     periodic:
       jobs:
         - ansible-test-sanity-docker-devel
@@ -100,8 +87,11 @@
         - ansible-test-units-ansible-utils-python27
         - ansible-test-units-ansible-utils-python36
         - ansible-test-units-ansible-utils-python37
-        - network-ee-unit-tests:
-            voting: false
+        - ansible-ee-tests-latest
+        - ansible-ee-tests-stable-2.9
+        - ansible-ee-tests-stable-2.10
+        - ansible-ee-tests-stable-2.11
+        - ansible-ee-tests-stable-2.12
     gate:
       queue: integrated
       jobs: *ansible-collections-ansible-utils-units-jobs