From 8275b8a8ed0cdfb778eccdc56a13758bb13ccf16 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 21 Oct 2024 19:29:51 -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

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

Change-Id: Ib83606d93656432e633007ebfcb7b6ad0aac7668
---
 .zuul.d/base.yaml        | 11 ++++++++++-
 .zuul.d/jobs_master.yaml | 14 +++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index eca08ed..f5548df 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -55,7 +55,7 @@
 - job:
     name: magnum-tempest-plugin-tests-cluster-base
     parent: magnum-tempest-plugin-base
-    nodeset: magnum-nested-virt-ubuntu-jammy
+    nodeset: magnum-nested-virt-ubuntu-noble
     vars:
       configure_swap_size: 8192
       tox_envlist: all
@@ -86,3 +86,12 @@
         nodes:
           - controller
 
+- nodeset:
+    name: magnum-nested-virt-ubuntu-noble
+    nodes:
+      - name: controller
+        label: nested-virt-ubuntu-noble
+    groups:
+      - name: tempest
+        nodes:
+          - controller
diff --git a/.zuul.d/jobs_master.yaml b/.zuul.d/jobs_master.yaml
index 1e0f332..b6cadca 100644
--- a/.zuul.d/jobs_master.yaml
+++ b/.zuul.d/jobs_master.yaml
@@ -35,10 +35,20 @@
             magnum:
               image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64
 
+
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on jammy. This job can be removed as per the future testing
+# runtime (whenever we start testing Ubuntu 26.04 as default version).
+- job:
+    name: magnum-tempest-plugin-tests-api-jammy
+    description: This job testing on Ubuntu jammy(22.04)
+    parent: magnum-tempest-plugin-tests-api
+    nodeset: openstack-single-node-noble
+
 - job:
     name: magnum-tempest-plugin-tests-cluster
     parent: magnum-tempest-plugin-tests-cluster-base
-    nodeset: magnum-nested-virt-ubuntu-jammy
+    nodeset: magnum-nested-virt-ubuntu-noble
     vars:
       devstack_localrc:
         MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz
@@ -53,8 +63,10 @@
     check:
       jobs:
         - magnum-tempest-plugin-tests-api
+        - magnum-tempest-plugin-tests-api-jammy
         - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.27
     gate:
       jobs:
         - magnum-tempest-plugin-tests-api
+        - magnum-tempest-plugin-tests-api-jammy
         - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.27