From 4efb3aee9c93d75fec79dc44664888957dcbe97a Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 18 Nov 2024 19:05:49 -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 adds a new job to run on Jammy which can be removed
in the next cycle.

Depends-On: https://review.opendev.org/c/openstack/octavia-tempest-plugin/+/935595

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

Change-Id: I5a68a1c0a0003742bddc5d707b0e40a5626b9771
---
 zuul.d/jobs.yaml     | 32 ++++++++++++++++++++++----------
 zuul.d/projects.yaml |  8 +++++++-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 7c3883dae2..3402e70549 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -9,14 +9,14 @@
         - openstack/octavia-lib
 
 - job:
-    name: publish-openstack-octavia-amphora-image-jammy
+    name: publish-openstack-octavia-amphora-image-noble
     parent: publish-openstack-octavia-amphora-image
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     description: |
-      Publish Ubuntu Jammy (22.04) based amphora image to tarballs.o.o.
+      Publish Ubuntu Noble (22.04) based amphora image to tarballs.o.o.
     vars:
         amphora_os: ubuntu
-        amphora_os_release: jammy
+        amphora_os_release: Noble
 
 - job:
     name: publish-openstack-octavia-amphora-image-centos-9-stream
@@ -31,7 +31,7 @@
 - job:
     name: octavia-grenade
     parent: grenade
-    nodeset: octavia-single-node-ubuntu-jammy
+    nodeset: octavia-single-node-ubuntu-noble
     required-projects: &o-grenade-required-projects
       - opendev.org/openstack/grenade
       - opendev.org/openstack/octavia
@@ -83,7 +83,7 @@
       Grenade job that skips a release, validating that deployers can skip
       specific releases as prescribed by our process.
     parent: grenade-skip-level
-    nodeset: octavia-single-node-ubuntu-jammy
+    nodeset: octavia-single-node-ubuntu-noble
     required-projects: *o-grenade-required-projects
     vars: *o-grenade-vars
 
@@ -172,17 +172,17 @@
         - openstack/octavia-lib
     vars:
         amphora_os: ubuntu
-        amphora_os_release: jammy
+        amphora_os_release: noble
 
 - job:
-    name: octavia-amphora-image-build-live-jammy
+    name: octavia-amphora-image-build-live-noble
     parent: octavia-amphora-image-build
     description: |
-      Builds an Ubuntu Jammy amphora image using diskimage-builder from Git
+      Builds an Ubuntu Noble amphora image using diskimage-builder from Git
       master. This job does not publish the image.
     vars:
         amphora_os: ubuntu
-        amphora_os_release: jammy
+        amphora_os_release: noble
 
 - job:
     name: octavia-amphora-image-build-live-centos-9-stream
@@ -258,3 +258,15 @@
         OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 9-stream
         OCTAVIA_AMP_IMAGE_SIZE: 3
         OCTAVIA_AMP_ENABLE_FIPS: True
+
+- job:
+    name: octavia-v2-dsvm-scenario-traffic-ops-ubuntu-jammy
+    parent: octavia-v2-dsvm-scenario-ubuntu-jammy
+    vars:
+      tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+    name: octavia-v2-dsvm-scenario-non-traffic-ops-ubuntu-jammy
+    parent: octavia-v2-dsvm-scenario-ubuntu-jammy
+    vars:
+      tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 54e89c93cf..f84d08eae6 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -46,6 +46,10 @@
             irrelevant-files: *irrelevant-files
         - octavia-v2-dsvm-scenario-non-traffic-ops:
             irrelevant-files: *irrelevant-files
+        - octavia-v2-dsvm-scenario-traffic-ops-ubuntu-jammy:
+            irrelevant-files: *irrelevant-files
+        - octavia-v2-dsvm-scenario-non-traffic-ops-ubuntu-jammy:
+            irrelevant-files: *irrelevant-files
         - octavia-v2-dsvm-scenario-traffic-ops-jobboard:
             irrelevant-files: *irrelevant-files
         - octavia-v2-dsvm-scenario-non-traffic-ops-jobboard:
@@ -107,12 +111,14 @@
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-scenario-traffic-ops
         - octavia-v2-dsvm-scenario-non-traffic-ops
+        - octavia-v2-dsvm-scenario-traffic-ops-ubuntu-jammy
+        - octavia-v2-dsvm-scenario-non-traffic-ops-ubuntu-jammy
         - octavia-v2-dsvm-tls-barbican
         - octavia-grenade
         #- octavia-grenade-skip-level
     periodic:
       jobs:
-        - publish-openstack-octavia-amphora-image-jammy:
+        - publish-openstack-octavia-amphora-image-noble:
             branches:
               regex: ^stable/.*$
               negate: true