From c80c940a4fd82fe94d144a6a98af092340e2f6a7 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 22 Oct 2024 12:12:42 -0700
Subject: [PATCH] Update gate jobs as per the 2025.1 cycle testing runtime

As per 2025.1 testing runtime[1], we need to test on Ubuntu
Noble (which will be taken care by depends-on tempest and devstack
patches to move base jobs to Noble) and at least single job to run on
Ubuntu Jammy (for smooth upgrade from previous releases).

This commit adds a new job to run on Jammy which can be removed
in future cycle when testing runtime test next version of Ubuntu
as default.

Depends-On: https://review.opendev.org/c/openstack/tempest/+/932156
Depends-On: https://review.opendev.org/c/openstack/watcher/+/933062

[1] https://governance.openstack.org/tc/reference/runtimes/2025.1.html

Change-Id: I1bc11633f4739bc87c7741496a2972ab99c9b08b
---
 .zuul.yaml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f0538e279..b5610fe33 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,6 +9,7 @@
     check:
       jobs:
         - watcher-tempest-functional
+        - watcher-tempest-functional-jammy
         - watcher-grenade
         - watcher-tempest-strategies
         - watcher-tempest-actuator
@@ -17,6 +18,7 @@
     gate:
       jobs:
         - watcher-tempest-functional
+        - watcher-tempest-functional-jammy
         - watcher-tempest-functional-ipv6-only
 
 - job:
@@ -89,7 +91,7 @@
 - job:
     name: watcher-tempest-multinode
     parent: watcher-tempest-functional
-    nodeset: openstack-two-node-jammy
+    nodeset: openstack-two-node-noble
     roles:
       - zuul: openstack/tempest
     group-vars:
@@ -170,6 +172,17 @@
       zuul_copy_output:
         /etc/hosts: logs
 
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on jammy. This job can be removed in the next cycle(2025.2)
+- job:
+    name: watcher-tempest-functional-jammy
+    description: This is integrated job testing on Ubuntu jammy(22.04)
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-jammy
+    vars:
+      <<: *base_vars
+      python_version: '3.9'
+
 - job:
     name: watcher-tempest-functional-ipv6-only
     parent: devstack-tempest-ipv6