From 1ca8c20d48a058937423287e5cd4e77ec4ee8dee Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 18 Nov 2024 20:13:14 -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 tempest and devstack
patches to move base jobs to Noble (depends-On)) and at least single
job to run on Ubutnu Jammy (for smooth upgrade from previous
releases).

This commit keep rbac default job continue running on Jammy
which can be moved to noble in 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: Id1d9282ede1c89ce71db18dccf9a37bd3e058edf
---
 .zuul.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d86a90a7d3..efa653e3c7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
     name: glance-tox-oslo-tips-base
     parent: tox
     abstract: true
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     timeout: 2400
     description: Abstract job for Glance vs. oslo libraries
     # NOTE(rosmaita): we only need functional test jobs, oslo is
@@ -53,7 +53,7 @@
     name: glance-tox-keystone-tips-base
     parent: tox
     abstract: true
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     timeout: 2400
     description: Abstract job for Glance vs. keystone
     required-projects:
@@ -105,7 +105,7 @@
     name: glance-tox-glance_store-tips-base
     parent: tox
     abstract: true
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     timeout: 2400
     description: Abstract job for Glance vs. glance_store
     required-projects:
@@ -155,7 +155,7 @@
     name: glance-tox-cursive-tips-base
     parent: tox
     abstract: true
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     timeout: 2400
     description: Abstract job for Glance vs. cursive and related libs
     required-projects:
@@ -354,6 +354,7 @@
 - job:
     name: tempest-integrated-storage-enforce-scope-new-defaults
     parent: tempest-integrated-storage
+    nodeset: openstack-single-node-jammy
     description: |
       This job runs the Tempest tests with scope and new defaults enabled
       Glance services.