From 8131ffa2b6a4c821c4bcb0114bc78474694461ba Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Tue, 24 Dec 2024 17:43:57 +0100
Subject: [PATCH 1/2] KUTTL: generate JUnitXML reports

- switch the type to XML (the accepted value is 'xml' lowercase,
  not uppercase);
- tune the name a bit to highlight it is a report;
- add the new reportGranularity parameter which is supported
  by kuttl 0.20.0 and will restore the pre-1.17 JUnitXML format
  (granularity by test case, instead of by step);
- remove the URL of kuttl, so that it is not tied to a specific
  release.

Signed-off-by: Luigi Toscano <ltoscano@redhat.com>
---
 kuttl-test.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kuttl-test.yaml b/kuttl-test.yaml
index 966982d7..420d2f87 100644
--- a/kuttl-test.yaml
+++ b/kuttl-test.yaml
@@ -6,9 +6,6 @@
 # ASSUMPTIONS:
 #
 # 1. Latest version of kuttl is installed at /usr/local/bin/kubectl-kuttl
-#    - wget https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
-#    - mv kubectl-kuttl_0.11.1_linux_x86_64 /usr/local/bin/kubectl-kuttl
-#    - chmod 755 /usr/local/bin/kubectl-kuttl
 # 2. An OCP 4.10+ CRC cluster with Podified Operators has been deployed
 # 3. CLI user has access to $KUBECONFIG
 # 4. The environment variable INSTALL_YAMLS is set to the the path of the
@@ -16,8 +13,9 @@
 
 apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
-reportFormat: JSON
-reportName: kuttl-test-swift
+reportFormat: xml
+reportName: kuttl-report-swift
+reportGranularity: test
 namespace: swift-kuttl-tests
 timeout: 600
 parallel: 1

From 86d7cb46bb599e93ed3977caa4f6ff8f1e506ccb Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Tue, 24 Dec 2024 17:45:49 +0100
Subject: [PATCH 2/2] Add KUTTL and tempest zuul jobs

They are meant to replace the prow ones in the long term.

Signed-off-by: Luigi Toscano <ltoscano@redhat.com>
---
 zuul.d/jobs.yaml     | 27 +++++++++++++++++++++++++++
 zuul.d/projects.yaml | 14 ++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 zuul.d/jobs.yaml
 create mode 100644 zuul.d/projects.yaml

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
new file mode 100644
index 00000000..67ae752d
--- /dev/null
+++ b/zuul.d/jobs.yaml
@@ -0,0 +1,27 @@
+---
+- job:
+    name: swift-operator-kuttl
+    parent: cifmw-base-multinode-kuttl
+    attempts: 1
+    required-projects:
+      - github.com/openstack-k8s-operators/swift-operator
+    irrelevant-files:
+      - .*/*.md
+      - ^\..*$
+      - ^LICENSE$
+      - ^OWNERS$
+      - ^OWNERS_ALIASES$
+      - ^PROJECT$
+      - ^README.md$
+      - tests?\/functional
+    vars:
+      cifmw_kuttl_tests_operator_list:
+        - swift
+
+- job:
+    name: swift-operator-tempest
+    parent: podified-multinode-hci-deployment-crc-1comp-backends
+    vars:
+      cifmw_test_operator_concurrency: 3
+      cifmw_test_operator_tempest_include_list: |
+        ^tempest.api.object_storage.
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
new file mode 100644
index 00000000..b36e13ba
--- /dev/null
+++ b/zuul.d/projects.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: openstack-k8s-operators/swift-operator
+    github-check:
+      jobs:
+        - openstack-k8s-operators-content-provider
+        - swift-operator-kuttl:
+            dependencies:
+              - openstack-k8s-operators-content-provider
+            voting: false
+        - swift-operator-tempest:
+            dependencies:
+              - openstack-k8s-operators-content-provider
+            voting: false