From 1a6da42684eba1239116ee4f9ea348e5a61dc547 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Tue, 19 Nov 2024 16:33:47 +0100
Subject: [PATCH] Switch Ubuntu distro jobs to 24.04

There is not Jammy support for Dalmatian (2024.2) in UCA, so distro
path will remain unsupported for it.

With that it makes sense to switch our jobs to test 24.04 instead of
22.04 for distro path.

Change-Id: Ia17e1b5246b5a1be926b9c90179b5296f19c442a
---
 zuul.d/jobs.yaml              | 21 ---------------------
 zuul.d/project-templates.yaml | 12 ++++++------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d80d3e1786..bec47ded15 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -646,27 +646,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-jammy
 
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal-ubuntu-jammy
-    parent: openstack-ansible-deploy-aio-distro
-    nodeset: ubuntu-jammy
-    voting: false
-
-- job:
-    name: openstack-ansible-deploy-aio_distro_lxc-ubuntu-jammy
-    parent: openstack-ansible-deploy-aio-distro
-    nodeset: ubuntu-jammy
-
-- job:
-    name: openstack-ansible-deploy-infra_distro_lxc-ubuntu-jammy
-    parent: openstack-ansible-deploy-aio-infra
-    nodeset: ubuntu-jammy
-
-- job:
-    name: openstack-ansible-deploy-hosts_distro_lxc-ubuntu-jammy
-    parent: openstack-ansible-deploy-aio-hosts
-    nodeset: ubuntu-jammy
-
 - job:
     name: openstack-ansible-deploy-hosts_lxc_zfs-ubuntu-jammy
     parent: openstack-ansible-deploy-aio
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 500049ab66..2fe843072d 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -118,12 +118,12 @@
       jobs:
         - openstack-ansible-deploy-infra_distro_lxc-rockylinux-9
         - openstack-ansible-deploy-infra_distro_lxc-debian-bookworm
-        - openstack-ansible-deploy-infra_distro_lxc-ubuntu-jammy
+        - openstack-ansible-deploy-infra_distro_lxc-ubuntu-noble
     gate:
       jobs:
         - openstack-ansible-deploy-infra_distro_lxc-rockylinux-9
         - openstack-ansible-deploy-infra_distro_lxc-debian-bookworm
-        - openstack-ansible-deploy-infra_distro_lxc-ubuntu-jammy
+        - openstack-ansible-deploy-infra_distro_lxc-ubuntu-noble
 
 - project-template:
     name: openstack-ansible-deploy-hosts_lxc-jobs
@@ -166,18 +166,18 @@
     check:
       jobs:
         - openstack-ansible-deploy-hosts_distro_lxc-rockylinux-9
-        - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-jammy
+        - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-noble
     gate:
       jobs:
         - openstack-ansible-deploy-hosts_distro_lxc-rockylinux-9
-        - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-jammy
+        - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-noble
 
 - project-template:
     name: openstack-ansible-deploy-aio_distro_lxc-jobs
     experimental:
       jobs:
         - openstack-ansible-deploy-aio_distro_lxc-debian-bookworm
-        - openstack-ansible-deploy-aio_distro_lxc-ubuntu-jammy
+        - openstack-ansible-deploy-aio_distro_lxc-ubuntu-noble
 
 - project-template:
     name: openstack-ansible-deploy-aio_metal-jobs
@@ -233,7 +233,7 @@
     check:
       jobs:
         - openstack-ansible-deploy-aio_distro_metal-rockylinux-9
-        - openstack-ansible-deploy-aio_distro_metal-ubuntu-jammy
+        - openstack-ansible-deploy-aio_distro_metal-ubuntu-noble
     experimental:
       jobs:
         - openstack-ansible-deploy-aio_distro_metal-debian-bookworm