Merge "Update 'Maintained' stable branch jobs on master gate"

.zuul.yaml

@@ -6,10 +6,9 @@
       jobs:
         - barbican-tempest-plugin-simple-crypto
         - barbican-tempest-plugin-simple-crypto-secure-rbac
+        - barbican-tempest-plugin-simple-crypto-yoga
         - barbican-tempest-plugin-simple-crypto-xena
         - barbican-tempest-plugin-simple-crypto-wallaby
-        - barbican-tempest-plugin-simple-crypto-victoria
-        - barbican-tempest-plugin-simple-crypto-ussuri
         - barbican-tempest-plugin-simple-crypto-ipv6-only
         - barbican-tempest-plugin-simple-crypto-castellan-src
         - barbican-tempest-plugin-simple-crypto-cursive
@@ -69,6 +68,11 @@
             barbican_rbac_scope_verification:
               enforce_scope: True
 
+- job:
+    name: barbican-tempest-plugin-simple-crypto-yoga
+    parent: barbican-tempest-plugin-simple-crypto
+    override-checkout: stable/yoga
+
 - job:
     name: barbican-tempest-plugin-simple-crypto-xena
     parent: barbican-tempest-plugin-simple-crypto
@@ -79,18 +83,6 @@
     parent: barbican-tempest-plugin-simple-crypto
     override-checkout: stable/wallaby
 
-- job:
-    name: barbican-tempest-plugin-simple-crypto-victoria
-    parent: barbican-tempest-plugin-simple-crypto
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/victoria
-
-- job:
-    name: barbican-tempest-plugin-simple-crypto-ussuri
-    parent: barbican-tempest-plugin-simple-crypto
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/ussuri
-
 - job:
     name: barbican-tempest-plugin-simple-crypto-ipv6-only
     parent: devstack-tempest-ipv6