From 4c4cdfebce1c29f7c8c6311ba9542c5674dc3338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Douglas=20Mendiz=C3=A1bal?= <dmendiza@redhat.com>
Date: Mon, 12 Feb 2024 11:00:33 -0500
Subject: [PATCH] Update supported branches

This patch updates the jobs to reflect the latest suported branches for
keystone.

Test jobs for both antleope (2023.1) and bobcat (2023.2) have been
added, and the jobs for the xena and yoga branches have been removed as
they are no longer maintained.

This patch also makes the protection jobs non-voting as they are
expected to fail due to policy changes in keystone.  A follow-up patch
fixes the test and re-enables the job.

Change-Id: I2d3968672eb4dd32a163827a7e24384578a4c913
---
 .zuul.yaml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index e79337d..799c05a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -44,30 +44,32 @@
         - keystone-dsvm-py3-functional-federation-ubuntu-focal:
             voting: false
         - keystone-dsvm-py3-functional-federation-ubuntu-focal-k2k
+        - keystone-dsvm-py3-functional-2023-2
+        - keystone-dsvm-py3-functional-2023-1
         - keystone-dsvm-py3-functional-zed
-        - keystone-dsvm-py3-functional-yoga
-        - keystone-dsvm-py3-functional-xena
-        - keystone-protection-functional
+        - keystone-protection-functional:
+            voting: false
     gate:
       jobs:
         - keystone-dsvm-py3-functional
         - keystone-dsvm-py3-functional-federation-ubuntu-focal-k2k
-        - keystone-protection-functional
+        - keystone-protection-functional:
+            voting: false
+
+- job:
+    name: keystone-dsvm-py3-functional-2023-2
+    parent: keystone-dsvm-py3-functional
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2023.2
+
+- job:
+    name: keystone-dsvm-py3-functional-2023-1
+    parent: keystone-dsvm-py3-functional
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2023.1
 
 - job:
     name: keystone-dsvm-py3-functional-zed
     parent: keystone-dsvm-py3-functional
     nodeset: openstack-single-node-focal
     override-checkout: stable/zed
-
-- job:
-    name: keystone-dsvm-py3-functional-yoga
-    parent: keystone-dsvm-py3-functional
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/yoga
-
-- job:
-    name: keystone-dsvm-py3-functional-xena
-    parent: keystone-dsvm-py3-functional
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/xena