commit 50bc3fb9e9ad650537c7d791b80c9c80c31600ae
author Zuul <zuul@review.opendev.org> Wed Jan 10 10:58:50 2024 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jan 10 10:58:50 2024 +0000
tree 4216e7c705a182f61958cd320836d3eba83031ff
parent 9067a9a1eb70be05549d683da922c985ef757536
parent ed387a0540d510b91be6db391c17a79bf3e71c24

Merge "Update stable jobs on master gate"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index c6a49d5..d76a9d1 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
@@ -254,6 +254,12 @@
     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
     nodeset: openstack-single-node-focal
@@ -265,18 +271,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:
@@ -407,6 +401,12 @@
       - ^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
     nodeset: openstack-single-node-focal
@@ -417,9 +417,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