From 44403352915f47f4264d9c8825123b6ebbabc138 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 29 Apr 2021 18:53:21 -0500
Subject: [PATCH] Add victoria/wallaby stable branch jobs on master gate

We have stable/victoria and stable/wallaby released so we
should add their job on master gate to keep branchless
tempest plugins compatible to those branch.

This also removes the stable/stein job as that is in EM
state now.

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

Change-Id: Ide464d5b64494050ff52f58832ed24bacecb83e9
---
 .zuul.yaml | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 59720ed..9531972 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,9 +7,10 @@
       jobs:
         - blazar-tempest-plugin-base
         - blazar-tempest-plugin-ipv6-only
+        - blazar-tempest-plugin-wallaby
+        - blazar-tempest-plugin-victoria
         - blazar-tempest-plugin-ussuri
         - blazar-tempest-plugin-train
-        - blazar-tempest-plugin-stein
     gate:
       queue: blazar
       jobs:
@@ -64,6 +65,16 @@
       - ^doc/.*$
       - ^releasenotes/.*$
 
+- job:
+    name: blazar-tempest-plugin-wallaby
+    parent: blazar-tempest-plugin-base
+    override-checkout: stable/wallaby
+
+- job:
+    name: blazar-tempest-plugin-victoria
+    parent: blazar-tempest-plugin-base
+    override-checkout: stable/victoria
+
 - job:
     name: blazar-tempest-plugin-ussuri
     parent: blazar-tempest-plugin-base
@@ -78,25 +89,3 @@
     vars:
       devstack_localrc:
         USE_PYTHON3: True
-
-- job:
-    name: blazar-tempest-plugin-stein
-    parent: blazar-tempest-plugin-base
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/stein
-    vars:
-      devstack_services:
-        # Disable unneeded services.
-        etcd3: false
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-        c-api: false
-        c-bak: false
-        c-sch: false
-        c-vol: false
-        cinder: false
-        horizon: false
-      devstack_localrc:
-        USE_PYTHON3: True