From 5bd2bcf0f9f0624f523d3d1ba3f23b4158dacc0c Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 25 May 2022 13:00:26 -0500
Subject: [PATCH] Cap cyborg-tempest-plugin version for stable/ussuri|victoria

We are capping stable/ussuri and victoria testing with Tempest
26.1.0 (choosing 26.1.0 because of bug#1955418)

- https://review.opendev.org/c/openstack/devstack/+/838051
- https://review.opendev.org/c/openstack/devstack/+/843295

and cyborg-tempest jobs in stable/ussuri|victoria is
failing due to that

- https://zuul.opendev.org/t/openstack/build/b5c679bb6ddf4b7cae630b8cc2b90766
To fix that we need to use compatible cyborg-tempest-plugin version for
Tempest 26.1.0, which is cyborg-tempest-plugin 1.4.0.

As stable/victoria is in EM, droping the victoria job from master gate.

Depends-On: https://review.opendev.org/c/openstack/devstack/+/838051

Change-Id: I8c599b7f8bb4705c12f67729c430aff2c047bc54
---
 .zuul.yaml | 56 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f8ab152..169d6d1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,7 +8,6 @@
         - cyborg-tempest-yoga
         - cyborg-tempest-xena
         - cyborg-tempest-wallaby
-        - cyborg-tempest-victoria
         - cyborg-tempest-ipv6-only
     gate:
       queue: cyborg
@@ -25,7 +24,8 @@
       - openstack/cyborg
       - openstack/python-cyborgclient
       - openstack/tempest
-      - openstack/cyborg-tempest-plugin
+      - name: openstack/cyborg-tempest-plugin
+        override-checkout: 1.4.0
     vars: &base_vars
       devstack_plugins:
         cyborg: https://opendev.org/openstack/cyborg
@@ -57,6 +57,53 @@
       - stable/stein
       - stable/train
 
+- job:
+    name: cyborg-tempest
+    description: |
+      Cyborg devstack tempest tests job for >=Ussuri release
+      run on python 3.
+    parent: devstack-tempest
+    timeout: 7800
+    required-projects:
+      - openstack/cyborg
+      - openstack/python-cyborgclient
+      - openstack/tempest
+      - name: openstack/cyborg-tempest-plugin
+        override-checkout: 1.4.0
+    # NOTE(gmann): This job is for ussuri and victoria
+    # where Tempest 26.1.0 is used so cyborg-tempest-plugin
+    # 1.4.0 is used instead of master.
+    branches:
+      - stable/ussuri
+      - stable/victoria
+    vars:
+      devstack_plugins:
+        cyborg: https://opendev.org/openstack/cyborg
+      devstack_services:
+        tempest: true
+        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
+      devstack_localrc:
+        TEMPEST_PLUGINS: "/opt/stack/cyborg-tempest-plugin"
+        USE_PYTHON3: true
+      tempest_test_regex: cyborg_tempest_plugin
+      tox_envlist: all
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^setup.cfg$
+      - ^releasenotes/.*$
+      - ^(test-|)requirements.txt$
+      - ^.git.*$
+      - ^tox.ini$
+
 - job:
     name: cyborg-tempest
     description: |
@@ -122,8 +169,3 @@
     name: cyborg-tempest-wallaby
     parent: cyborg-tempest
     override-checkout: stable/wallaby
-
-- job:
-    name: cyborg-tempest-victoria
-    parent: cyborg-tempest
-    override-checkout: stable/victoria