From 756b23bd4ba7010067b6b9c625534dac0cfe87ae Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 17 Dec 2024 12:57:04 +0100
Subject: [PATCH] CI: Switch previous_release to 2024.2 and slurp to 2024.1

Switch Jammy jobs to Noble as well - since we switched to
Noble in 2024.2

Change-Id: If450941a51ebc5404e39003b702309ee3c66e1ea
---
 zuul.d/base.yaml |  2 +-
 zuul.d/jobs.yaml | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 6d1341de9c..4b6a880695 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -36,7 +36,7 @@
       neutron_tenant_network_dns_server: "8.8.8.8"
       neutron_tenant_network_prefix: "203.0.113."
       neutron_tenant_network_prefix_length: "24"
-      previous_release: "2024.1"
+      previous_release: "2024.2"
       scenario: core
       tls_enabled: false
       virt_type: qemu
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 38d7da5e21..5c278c761d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -167,7 +167,7 @@
       base_distro: rocky
       is_upgrade: yes
       is_slurp: yes
-      previous_release: 2023.1
+      previous_release: 2024.1
       tls_enabled: true
 
 - job:
@@ -190,7 +190,7 @@
       base_distro: debian
       is_upgrade: yes
       is_slurp: yes
-      previous_release: 2023.1
+      previous_release: 2024.1
       tls_enabled: true
 
 - job:
@@ -202,7 +202,7 @@
 - job:
     name: kolla-ansible-ubuntu-upgrade
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-jammy
+    nodeset: kolla-ansible-noble
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -219,7 +219,7 @@
       base_distro: ubuntu
       is_upgrade: yes
       is_slurp: yes
-      previous_release: 2023.1
+      previous_release: 2024.1
       tls_enabled: true
 
 - job:
@@ -241,12 +241,12 @@
       base_distro: rocky
       is_upgrade: yes
       is_slurp: yes
-      previous_release: 2023.1
+      previous_release: 2024.1
 
 - job:
     name: kolla-ansible-ubuntu-upgrade-cephadm
     parent: kolla-ansible-cephadm-base
-    nodeset: kolla-ansible-jammy-multi
+    nodeset: kolla-ansible-noble-multi
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -263,7 +263,7 @@
       base_distro: ubuntu
       is_upgrade: yes
       is_slurp: yes
-      previous_release: 2023.1
+      previous_release: 2024.1
       cephadm_use_package_from_distribution: true
 
 - job:
@@ -287,7 +287,7 @@
 - job:
     name: kolla-ansible-ubuntu-upgrade-ovn
     parent: kolla-ansible-ovn-base
-    nodeset: kolla-ansible-jammy-multi
+    nodeset: kolla-ansible-noble-multi
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -509,7 +509,7 @@
 - job:
     name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade
     parent: kolla-ansible-prometheus-opensearch-base
-    nodeset: kolla-ansible-jammy
+    nodeset: kolla-ansible-noble
     vars:
       base_distro: ubuntu
       is_upgrade: yes