From 3133805e3d34dbe2f7eee44b7d6a73f656a62cee Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 24 Jan 2025 21:53:12 +0100
Subject: [PATCH] CI: Set previous_release for Epoxy

The previous release is 2024.2 (Dalmatian), or 2024.1 (Caracal) for
SLURP jobs.

Also switch Ubuntu upgrade jobs to 24.04. SLURP testing on Ubuntu will
be enabled once support for Ubuntu 24.04 is backported to 2024.1.

Change-Id: I9fdd017f857e9f56fd4926a3314443348fe53fe1
---
 zuul.d/jobs.yaml    | 18 +++++++++---------
 zuul.d/project.yaml |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index eddd5318f..48044ebc8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -104,7 +104,7 @@
       tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
       is_upgrade: "{{ 'upgrade' in zuul.job }}"
       is_slurp: "{{ 'slurp' in zuul.job }}"
-      previous_release: "{{ '2024.1' if is_slurp else '2024.1' }}"
+      previous_release: "{{ '2024.1' if is_slurp else '2024.2' }}"
       tls_enabled: false
       ironic_boot_mode: "bios"
 
@@ -171,9 +171,9 @@
     nodeset: kayobe-rocky9
 
 - job:
-    name: kayobe-overcloud-upgrade-ubuntu-jammy
+    name: kayobe-overcloud-upgrade-ubuntu-noble
     parent: kayobe-overcloud-upgrade-base
-    nodeset: kayobe-ubuntu-jammy
+    nodeset: kayobe-ubuntu-noble
 
 - job:
     name: kayobe-overcloud-upgrade-slurp-rocky9
@@ -181,9 +181,9 @@
     nodeset: kayobe-rocky9
 
 - job:
-    name: kayobe-overcloud-upgrade-slurp-ubuntu-jammy
+    name: kayobe-overcloud-upgrade-slurp-ubuntu-noble
     parent: kayobe-overcloud-upgrade-base
-    nodeset: kayobe-ubuntu-jammy
+    nodeset: kayobe-ubuntu-noble
 
 - job:
     name: kayobe-seed-base
@@ -295,9 +295,9 @@
     nodeset: kayobe-rocky9
 
 - job:
-    name: kayobe-seed-upgrade-ubuntu-jammy
+    name: kayobe-seed-upgrade-ubuntu-noble
     parent: kayobe-seed-upgrade-base
-    nodeset: kayobe-ubuntu-jammy
+    nodeset: kayobe-ubuntu-noble
 
 - job:
     name: kayobe-seed-upgrade-slurp-rocky9
@@ -305,9 +305,9 @@
     nodeset: kayobe-rocky9
 
 - job:
-    name: kayobe-seed-upgrade-slurp-ubuntu-jammy
+    name: kayobe-seed-upgrade-slurp-ubuntu-noble
     parent: kayobe-seed-upgrade-base
-    nodeset: kayobe-ubuntu-jammy
+    nodeset: kayobe-ubuntu-noble
 
 - job:
     name: kayobe-seed-vm-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 259856e83..0fbcaf744 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,12 +22,12 @@
         - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-upgrade-rocky9
-        - kayobe-overcloud-upgrade-ubuntu-jammy
+        - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-images-rocky9
         - kayobe-seed-upgrade-rocky9
-        - kayobe-seed-upgrade-ubuntu-jammy
+        - kayobe-seed-upgrade-ubuntu-noble
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-rocky9-efi
         - kayobe-seed-vm-ubuntu-noble
@@ -48,11 +48,11 @@
         - kayobe-overcloud-host-configure-rocky9
         - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-upgrade-rocky9
-        - kayobe-overcloud-upgrade-ubuntu-jammy
+        - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-upgrade-rocky9
-        - kayobe-seed-upgrade-ubuntu-jammy
+        - kayobe-seed-upgrade-ubuntu-noble
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-noble
         - kayobe-infra-vm-rocky9