From e8441d7c95fef7feb94a25376fd8c86dfaae31f3 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Fri, 20 Dec 2024 11:43:27 -0800
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
Ubutnu Jammy (for smooth upgrade from previous releases).

This commit keep a scenario job to run on Jammy which can be removed
in the next cycle.

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

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

Change-Id: I8219106ec26ddc2edfaf39a69c64a9887fdfb54c
---
 zuul.d/jobs.yaml | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8af98cec..452e1e4e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -28,6 +28,16 @@
         nodes:
           - controller
 
+- nodeset:
+    name: octavia-single-node-ubuntu-noble
+    nodes:
+      - name: controller
+        label: nested-virt-ubuntu-noble
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
 - nodeset:
     name: octavia-single-node-centos-8
     nodes:
@@ -72,9 +82,9 @@
     name: octavia-two-node
     nodes:
       - name: controller
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
       - name: controller2
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
     groups:
       - name: controller
         nodes:
@@ -219,7 +229,7 @@
 - job:
     name: octavia-dsvm-live-base
     parent: octavia-dsvm-base
-    nodeset: octavia-single-node-ubuntu-jammy
+    nodeset: octavia-single-node-ubuntu-noble
     timeout: 9000
     required-projects:
       - openstack/diskimage-builder
@@ -255,7 +265,7 @@
 - job:
     name: octavia-dsvm-live-base-ipv6-only
     parent: octavia-dsvm-base-ipv6-only
-    nodeset: octavia-single-node-ubuntu-jammy
+    nodeset: octavia-single-node-ubuntu-noble
     timeout: 9000
     required-projects:
       - openstack/diskimage-builder
@@ -592,8 +602,14 @@
     name: octavia-v2-dsvm-scenario
     parent: octavia-v2-dsvm-scenario-base
     branches:
-      regex: ^(unmaintained/)
+      regex: ^(unmaintained/|stable/(2023.2|2024.1|2024.2))
       negate: true
+    nodeset: octavia-single-node-ubuntu-noble
+
+- job:
+    name: octavia-v2-dsvm-scenario
+    parent: octavia-v2-dsvm-scenario-base
+    branches: ^(stable/(2023.2|2024.1|2024.2))
     nodeset: octavia-single-node-ubuntu-jammy
 
 - job:
@@ -844,6 +860,7 @@
 - job:
     name: octavia-v2-dsvm-scenario-ubuntu-jammy
     parent: octavia-v2-dsvm-scenario
+    nodeset: octavia-single-node-ubuntu-jammy
     vars:
       devstack_localrc:
         OCTAVIA_AMP_BASE_OS: ubuntu
@@ -881,8 +898,14 @@
     name: octavia-v2-dsvm-tls-barbican
     parent: octavia-v2-dsvm-tls-barbican-base
     branches:
-      regex: ^(unmaintained/)
+      regex: ^(unmaintained/|stable/(2023.2|2024.1|2024.2))
       negate: true
+    nodeset: octavia-single-node-ubuntu-noble
+
+- job:
+    name: octavia-v2-dsvm-tls-barbican
+    parent: octavia-v2-dsvm-tls-barbican-base
+    branches: ^(stable/(2023.2|2024.1|2024.2))
     nodeset: octavia-single-node-ubuntu-jammy
 
 - job:
@@ -1040,8 +1063,14 @@
     name: octavia-v2-act-stdby-dsvm-scenario
     parent: octavia-v2-act-stdby-dsvm-scenario-base
     branches:
-      regex: ^(unmaintained/)
+      regex: ^(unmaintained/|stable/(2023.2|2024.1|2024.2))
       negate: true
+    nodeset: octavia-single-node-ubuntu-noble
+
+- job:
+    name: octavia-v2-act-stdby-dsvm-scenario
+    parent: octavia-v2-act-stdby-dsvm-scenario-base
+    branches: ^(stable/(2023.2|2024.1|2024.2))
     nodeset: octavia-single-node-ubuntu-jammy
 
 - job: