From 89fe14ec559f4c34a9f3ae5d67ff25eddf939678 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 5 Oct 2020 20:50:20 -0500
Subject: [PATCH] [goal] Keep barbican-tempest-plugin stable jobs to bionic

As per victoria cycle testing runtime and community goal
we need to migrate upstream CI/CD to Ubuntu Focal(20.04).

Tempest based jobs are migrated automatically via devstack
base job start running on Focal but stable jobs testing stable
branch needs to keep running on their supported
distro version which is bionic from train till ussuri.

Also, remove stein support (removed from tempest)
and add a job for victoria.

Change-Id: I3d792925e81172ae8abe75c5ceb2d5a039fc84f7
Story: #2007865
Task: #40184
---
 .zuul.yaml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4af2e62..1b3cb87 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,9 +5,9 @@
     check:
       jobs:
         - barbican-tempest-plugin-simple-crypto
+        - barbican-tempest-plugin-simple-crypto-victoria
         - barbican-tempest-plugin-simple-crypto-ussuri
         - barbican-tempest-plugin-simple-crypto-train
-        - barbican-tempest-plugin-simple-crypto-stein
         - barbican-tempest-plugin-simple-crypto-ipv6-only
         - barbican-tempest-plugin-simple-crypto-castellan-src
         - barbican-tempest-plugin-simple-crypto-cursive
@@ -27,7 +27,6 @@
       devstack_plugins:
         barbican: https://opendev.org/openstack/barbican
       devstack_localrc:
-        USE_PYTHON3: true
         NOVA_BACKEND: LVM
         LVM_VOLUME_CLEAR: none
       devstack_local_conf:
@@ -53,21 +52,24 @@
       tempest_plugins:
         - barbican-tempest-plugin
 
+- 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-train
     parent: barbican-tempest-plugin-simple-crypto
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/train
 
-- job:
-    name: barbican-tempest-plugin-simple-crypto-stein
-    parent: barbican-tempest-plugin-simple-crypto
-    override-checkout: stable/stein
-
 - job:
     name: barbican-tempest-plugin-simple-crypto-ipv6-only
     parent: devstack-tempest-ipv6