From f5c268b9be24d46b30250eb0a2d328c04f9670a2 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sat, 15 Oct 2022 20:49:45 -0500
Subject: [PATCH] Pin stable branch jobs nodeset to Ubuntu Focal (20.04)

In 2023.1 cycle. we are moving the default distro
version of Ubuntu to Jammy (22.04)[1] so we need to pin
the nodeset for stable branch job in master gate so that
they continue run on their supporting distro version which is
Ubuntu Focal since stable/victoria.

Also fixing the zuul config error.

[1] https://governance.openstack.org/tc/goals/selected/migrate-ci-jobs-to-ubuntu-jammy.html

Depends-On: https://review.opendev.org/c/openstack/python-freezerclient/+/936800
Depends-On: https://review.opendev.org/c/openstack/freezer-api/+/936802
Depends-On: https://review.opendev.org/c/openstack/freezer/+/936780
Change-Id: I4989b51e5d7ae68f2b11adefb349c61408a409ed
---
 .zuul.yaml | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index fccba66..49278d8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 - project:
+    queue: freezer
     templates:
       - check-requirements
       - tempest-plugin-jobs
@@ -8,16 +9,10 @@
         - freezer-tempest-client
         - freezer-tempest-scheduler
         - freezer-tempest-agent
-        - freezer-tempest-basic-sql
-        - freezer-tempest-basic-yoga
-        - freezer-tempest-basic-xena
-        - freezer-tempest-basic-wallaby
 
     gate:
-      queue: freezer
       jobs:
         - freezer-tempest-basic
-        - freezer-tempest-basic-sql
         - freezer-tempest-client
         - freezer-tempest-scheduler
         - freezer-tempest-agent
@@ -82,24 +77,10 @@
     vars:
       tempest_test_regex: '^(freezer_tempest_plugin.tests.freezer.agent.)'
 
+# NOTE(noonedeadpunk): Remove once will be dropped from all stable branches
 - job:
     name: freezer-tempest-basic-sql
     parent: freezer-tempest-basic
     vars:
       devstack_localrc:
         FREEZER_BACKEND: 'sqlalchemy'
-
-- job:
-    name: freezer-tempest-basic-yoga
-    parent: freezer-tempest-basic
-    override-checkout: stable/yoga
-
-- job:
-    name: freezer-tempest-basic-xena
-    parent: freezer-tempest-basic
-    override-checkout: stable/xena
-
-- job:
-    name: freezer-tempest-basic-wallaby
-    parent: freezer-tempest-basic
-    override-checkout: stable/wallaby