From 2be53fff37bd16ecdaca27b256afec8964ee7fac Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 31 May 2022 19:00:02 -0500
Subject: [PATCH] Update stable branches jobs on master gate

we have stable/xena and stable/yoga also present
and supported so we should add their job on master
gate to keep branchless tempest plugins compatible
to stable branch.

This also removes the old EM stable branches which are
stein, train, ussuri, and victoria jobs.

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

Change-Id: Ifebd2506a199dbf606ce253e020556caab93c05e
---
 .zuul.yaml | 50 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 9f6e896..da638f1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,48 +8,28 @@
         - watcher-tempest-functional
         - watcher-tempest-actuator
         - watcher-tempest-strategies
+        - watcher-tempest-functional-yoga
+        - watcher-tempest-functional-xena
         - watcher-tempest-functional-wallaby
-        - watcher-tempest-functional-victoria
-        - watcher-tempest-functional-ussuri
-        - watcher-tempest-functional-train
-        - watcher-tempest-functional-stein
     gate:
       queue: watcher
       jobs:
         - watcher-tempest-functional
 
+- job:
+    name: watcher-tempest-functional-yoga
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-focal
+    override-checkout: stable/yoga
+
+- job:
+    name: watcher-tempest-functional-xena
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-focal
+    override-checkout: stable/xena
+
 - job:
     name: watcher-tempest-functional-wallaby
     parent: watcher-tempest-functional
-    nodeset: openstack-single-node-bionic
+    nodeset: openstack-single-node-focal
     override-checkout: stable/wallaby
-
-- job:
-    name: watcher-tempest-functional-victoria
-    parent: watcher-tempest-functional
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/victoria
-
-- job:
-    name: watcher-tempest-functional-ussuri
-    parent: watcher-tempest-functional
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/ussuri
-
-- job:
-    name: watcher-tempest-functional-train
-    parent: watcher-tempest-functional
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/train
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True
-
-- job:
-    name: watcher-tempest-functional-stein
-    parent: watcher-tempest-functional
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/stein
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True