Update 'Maintained' stable branch jobs on master gate
We have stable/yoga released and stable/ussuri is in
'Extended Maintenance' state. Current 'Maintained'
stable branches are yoga, xena, wallaby, and victoria.
As per tempest stable branch testing policy[1], adding the
newly released stable/yoga job and remove the EM stable/ussuri
job.
[1] https://docs.openstack.org/tempest/latest/stable_branch_testing_policy.html
Change-Id: I925264fd0cff732181ec44c76310225b93490284
diff --git a/.zuul.yaml b/.zuul.yaml
index 0b120b2..af00a1b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,10 +12,10 @@
voting: false
- cinder-tempest-plugin-cbak-ceph
- cinder-tempest-plugin-cbak-s3
+ - cinder-tempest-plugin-basic-yoga
- cinder-tempest-plugin-basic-xena
- cinder-tempest-plugin-basic-wallaby
- cinder-tempest-plugin-basic-victoria
- - cinder-tempest-plugin-basic-ussuri
# Set this job to voting once we have some actual tests to run
- cinder-tempest-plugin-protection-functional:
voting: false
@@ -26,10 +26,10 @@
- cinder-tempest-plugin-cbak-ceph
experimental:
jobs:
+ - cinder-tempest-plugin-cbak-ceph-yoga
- cinder-tempest-plugin-cbak-ceph-xena
- cinder-tempest-plugin-cbak-ceph-wallaby
- cinder-tempest-plugin-cbak-ceph-victoria
- - cinder-tempest-plugin-cbak-ceph-ussuri
- job:
name: cinder-tempest-plugin-protection-functional
@@ -159,6 +159,12 @@
c-bak: true
- job:
+ name: cinder-tempest-plugin-cbak-ceph-yoga
+ parent: cinder-tempest-plugin-cbak-ceph
+ 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
@@ -176,12 +182,6 @@
nodeset: openstack-single-node-focal
override-checkout: stable/victoria
-- job:
- name: cinder-tempest-plugin-cbak-ceph-ussuri
- parent: cinder-tempest-plugin-cbak-ceph
- nodeset: openstack-single-node-bionic
- override-checkout: stable/ussuri
-
# variant for pre-Ussuri branches (no volume revert for Ceph),
# should this job be used on those branches
- job:
@@ -258,6 +258,12 @@
- ^releasenotes/.*$
- job:
+ name: cinder-tempest-plugin-basic-yoga
+ 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
@@ -274,9 +280,3 @@
parent: cinder-tempest-plugin-basic
nodeset: openstack-single-node-focal
override-checkout: stable/victoria
-
-- job:
- name: cinder-tempest-plugin-basic-ussuri
- parent: cinder-tempest-plugin-basic
- nodeset: openstack-single-node-bionic
- override-checkout: stable/ussuri