From a3130bf641626fa4e29d26da3c38baf57a282f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <mdulko@redhat.com>
Date: Thu, 21 Sep 2023 11:01:27 +0200
Subject: [PATCH] Bump jobs base to Ubuntu 22.04 Jammy

DevStack stopped accepting Ubuntu 20.04 Focal, so we need to bump the
version we use to Jammy. This commit does so.

Change-Id: I7b227dfb29b49ff6a561209938a2c263f5dd2f90
---
 .zuul.d/base.yaml                   |  2 +-
 .zuul.d/nodesets.yaml               | 10 +++++-----
 .zuul.d/tempest-jobs.yaml           |  6 +++---
 .zuul.d/tempest-multinode-jobs.yaml |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 92fe7912c..cf1f9ab1c 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -221,7 +221,7 @@
 - job:
     name: kuryr-kubernetes-octavia-base-ovs
     parent: kuryr-kubernetes-base-ovs
-    nodeset: kuryr-nested-virt-ubuntu-focal
+    nodeset: kuryr-nested-virt-ubuntu-jammy
     description: |
       Kuryr-Kubernetes tempest job using OVS and amphora driver for Octavia
     required-projects:
diff --git a/.zuul.d/nodesets.yaml b/.zuul.d/nodesets.yaml
index 8bc314f2d..10381df7a 100644
--- a/.zuul.d/nodesets.yaml
+++ b/.zuul.d/nodesets.yaml
@@ -23,22 +23,22 @@
           - controller
 
 - nodeset:
-    name: kuryr-nested-virt-ubuntu-focal
+    name: kuryr-nested-virt-ubuntu-jammy
     nodes:
       - name: controller
-        label: nested-virt-ubuntu-focal
+        label: nested-virt-ubuntu-jammy
     groups:
       - name: tempest
         nodes:
           - controller
 
 - nodeset:
-    name: kuryr-nested-virt-two-node-focal
+    name: kuryr-nested-virt-two-node-jammy
     nodes:
       - name: controller
-        label: nested-virt-ubuntu-focal
+        label: nested-virt-ubuntu-jammy
       - name: compute1
-        label: nested-virt-ubuntu-focal
+        label: nested-virt-ubuntu-jammy
     groups:
       # Node where tests are executed and test results collected
       - name: tempest
diff --git a/.zuul.d/tempest-jobs.yaml b/.zuul.d/tempest-jobs.yaml
index fc34069fe..8a9730a20 100644
--- a/.zuul.d/tempest-jobs.yaml
+++ b/.zuul.d/tempest-jobs.yaml
@@ -46,7 +46,7 @@
 - job:
     name: kuryr-kubernetes-tempest-defaults
     parent: kuryr-kubernetes-octavia-base
-    nodeset: kuryr-nested-virt-ubuntu-focal
+    nodeset: kuryr-nested-virt-ubuntu-jammy
     description: |
       Kuryr-Kubernetes tempest job running kuryr containerized with OVN,
       Octavias amphora, default set of handlers, default SG driver and default
@@ -85,7 +85,7 @@
 
 - job:
     name: kuryr-kubernetes-tempest-ipv6
-    nodeset: kuryr-nested-virt-ubuntu-focal
+    nodeset: kuryr-nested-virt-ubuntu-jammy
     parent: kuryr-kubernetes-octavia-base
     description: |
       Kuryr-Kubernetes tempest job running kuryr containerized with IPv6 pod
@@ -189,7 +189,7 @@
 - job:
     name: kuryr-kubernetes-tempest-amphora
     parent: kuryr-kubernetes-base-ovn
-    nodeset: kuryr-nested-virt-ubuntu-focal
+    nodeset: kuryr-nested-virt-ubuntu-jammy
     required-projects:
       - openstack/octavia
       - openstack/python-octaviaclient
diff --git a/.zuul.d/tempest-multinode-jobs.yaml b/.zuul.d/tempest-multinode-jobs.yaml
index 8d48272ef..98b2b8f55 100644
--- a/.zuul.d/tempest-multinode-jobs.yaml
+++ b/.zuul.d/tempest-multinode-jobs.yaml
@@ -17,7 +17,7 @@
     parent: kuryr-kubernetes-octavia-base
     description: |
         Kuryr-Kubernetes tempest multinode job with OVN
-    nodeset: kuryr-nested-virt-two-node-focal
+    nodeset: kuryr-nested-virt-two-node-jammy
     host-vars:
       controller:
         devstack_plugins:
@@ -99,7 +99,7 @@
     parent: kuryr-kubernetes-octavia-base-ovs
     description: |
         Kuryr-Kubernetes tempest multinode job with OVS
-    nodeset: kuryr-nested-virt-two-node-focal
+    nodeset: kuryr-nested-virt-two-node-jammy
     group-vars:
       subnode:
         devstack_plugins: