Merge "Cleanup not used job aliases"
diff --git a/releasenotes/notes/advance-image-ubuntu-jammy-2204-11b5ee414d665b66.yaml b/releasenotes/notes/advance-image-ubuntu-jammy-2204-11b5ee414d665b66.yaml
new file mode 100644
index 0000000..49d7652
--- /dev/null
+++ b/releasenotes/notes/advance-image-ubuntu-jammy-2204-11b5ee414d665b66.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    The testing advanced image used in some jobs has been bumped from Ubuntu
+    Focal 20.04 to Ubuntu Jammy 22.04.
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index c13ee55..32e9821 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -26,11 +26,11 @@
         USE_PYTHON3: true
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
         PHYSICAL_NETWORK: public
-        IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
+        IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
         CIRROS_VERSION: 0.6.3
         DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec
         DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz
-        ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
+        ADVANCED_IMAGE_NAME: ubuntu-22.04-minimal-cloudimg-amd64
         ADVANCED_INSTANCE_TYPE: ntp_image_256M
         ADVANCED_INSTANCE_USER: ubuntu
         CUSTOMIZE_IMAGE: true
@@ -610,6 +610,10 @@
         OVN_DBS_LOG_LEVEL: dbg
         ENABLE_TLS: True
         OVN_IGMP_SNOOPING_ENABLE: True
+        # NOTE(ralonsoh): ubuntu-22.04-minimal is not used due to an issue with
+        # the IGMP messages. See https://bugs.launchpad.net/cloud-images/+bug/2110520
+        IMAGE_URLS: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
+        ADVANCED_IMAGE_NAME: jammy-server-cloudimg-amd64
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
@@ -771,8 +775,8 @@
         CIRROS_VERSION: 0.6.3
         DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec
         DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz
-        IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
-        ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
+        IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
+        ADVANCED_IMAGE_NAME: ubuntu-22.04-minimal-cloudimg-amd64
         ADVANCED_INSTANCE_TYPE: ntp_image_256M
         ADVANCED_INSTANCE_USER: ubuntu
         CUSTOMIZE_IMAGE: true
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index be6c65e..2bb33e5 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -6,8 +6,12 @@
     required-projects: &required-projects-yoga
       - openstack/neutron
       - name: openstack/neutron-tempest-plugin
-        override-checkout: 2.6.0
+        override-checkout: yoga-last
       - openstack/tempest
+      - name: openstack/designate-tempest-plugin
+        override-checkout: yoga-last
+      - name: openstack/designate
+        override-checkout: yoga-eol
     vars:
       devstack_localrc:
         NEUTRON_DEPLOY_MOD_WSGI: false