From ed387a0540d510b91be6db391c17a79bf3e71c24 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 8 Jun 2023 22:31:17 -0500
Subject: [PATCH] Update stable jobs on master gate

As 2023.1 is released, we should add its job on master
gate to keep branchless tempest plugins compatible
to stable branch.

Also, removing the stable/xena job as that is in EM
state.
- https://review.opendev.org/c/openstack/releases/+/881254

Ref: Tempest plugins guide for stable branch testing:
- https://docs.openstack.org/tempest/latest/stable_branch_testing_policy.html

Change-Id: I39b5296ee68544a43182dcb346a040856d062aca
---
 .zuul.yaml | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 80eabe8..6122dce 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -25,9 +25,9 @@
         # branches. That is what we need to do for all tempest plugins. Only jobs
         # for the current releasable ("Maintained") stable branches should be listed
         # here.
+        - cinder-tempest-plugin-basic-2023-1
         - cinder-tempest-plugin-basic-zed
         - cinder-tempest-plugin-basic-yoga
-        - cinder-tempest-plugin-basic-xena
         - cinder-tempest-plugin-protection-functional
     gate:
       jobs:
@@ -38,9 +38,9 @@
         - cinder-tempest-plugin-cbak-ceph
     experimental:
       jobs:
+        - cinder-tempest-plugin-cbak-ceph-2023-1
         - cinder-tempest-plugin-cbak-ceph-zed
         - cinder-tempest-plugin-cbak-ceph-yoga
-        - cinder-tempest-plugin-cbak-ceph-xena
 
 - job:
     name: cinder-tempest-plugin-protection-functional
@@ -251,6 +251,12 @@
         CINDER_QUOTA_VOLUMES: 25
     timeout: 10800
 
+- job:
+    name: cinder-tempest-plugin-cbak-ceph-2023-1
+    parent: cinder-tempest-plugin-cbak-ceph
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2023.1
+
 - job:
     name: cinder-tempest-plugin-cbak-ceph-zed
     parent: cinder-tempest-plugin-cbak-ceph
@@ -263,18 +269,6 @@
     nodeset: openstack-single-node-focal
     override-checkout: stable/yoga
 
-- job:
-    name: cinder-tempest-plugin-cbak-ceph-xena
-    parent: cinder-tempest-plugin-cbak-ceph
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/xena
-
-- job:
-    name: cinder-tempest-plugin-cbak-ceph-wallaby
-    parent: cinder-tempest-plugin-cbak-ceph
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/wallaby
-
 # variant for pre-Ussuri branches (no volume revert for Ceph),
 # should this job be used on those branches
 - job:
@@ -405,6 +399,12 @@
       - ^doc/.*$
       - ^releasenotes/.*$
 
+- job:
+    name: cinder-tempest-plugin-basic-2023-1
+    parent: cinder-tempest-plugin-basic
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2023.1
+
 - job:
     name: cinder-tempest-plugin-basic-zed
     parent: cinder-tempest-plugin-basic
@@ -416,9 +416,3 @@
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-focal
     override-checkout: stable/yoga
-
-- job:
-    name: cinder-tempest-plugin-basic-xena
-    parent: cinder-tempest-plugin-basic
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/xena