From c228c68d726c2c11d76dfee78de519accf30d1ca Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 4 May 2023 07:10:02 -0700
Subject: [PATCH] Advance tempest plugin tests to Zed (mostly)

Also advances the anaconda job to 2023.1, since it fails
in a very odd way on Zed, and it looks like I might not have
had all of the CI related fixes on Zed.

Change-Id: Ib7142d2bfcf0cae84dbc647a5870a2e1d4768e25
---
 zuul.d/project.yaml     | 23 +++++++++++++++++------
 zuul.d/stable-jobs.yaml | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 9bde6c3..5fb5ef6 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,22 +7,30 @@
       jobs:
         # NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
         - ironic-standalone
+        - ironic-standalone-zed
         - ironic-standalone-yoga
-        - ironic-standalone-xena
+        - ironic-standalone-xena:
+            voting: false
         - ironic-standalone-wallaby:
             voting: false
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-zed
         - ironic-tempest-functional-python3-yoga
-        - ironic-tempest-functional-python3-xena
+        - ironic-tempest-functional-python3-xena:
+            voting: false
         - ironic-tempest-functional-python3-wallaby:
             voting: false
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-zed
         - ironic-inspector-tempest-yoga
-        - ironic-inspector-tempest-xena
+        - ironic-inspector-tempest-xena:
+            voting: false
         - ironic-inspector-tempest-wallaby:
             voting: false
         - ironic-standalone-anaconda
+        - ironic-standalone-anaconda-2023.1
         - ironic-standalone-redfish
+        - ironic-standalone-redfish-zed
         - ironic-standalone-redfish-yoga:
             voting: false
         - ironic-standalone-redfish-xena:
@@ -33,6 +41,8 @@
         # unstable, so keep them non-voting.
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
             voting: false
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-zed:
+            voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-yoga:
             voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena:
@@ -40,6 +50,7 @@
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby:
             voting: false
         - ironic-inspector-tempest-discovery
+        - ironic-inspector-tempest-discovery-zed
         - ironic-inspector-tempest-discovery-yoga:
             voting: false
         - ironic-inspector-tempest-discovery-xena:
@@ -49,13 +60,13 @@
     gate:
       jobs:
         - ironic-standalone
+        - ironic-standalone-zed
         - ironic-standalone-yoga
-        - ironic-standalone-xena
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-zed
         - ironic-tempest-functional-python3-yoga
-        - ironic-tempest-functional-python3-xena
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-zed
         - ironic-inspector-tempest-yoga
-        - ironic-inspector-tempest-xena
         - ironic-standalone-redfish
         - ironic-inspector-tempest-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 42099c6..84af105 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,3 +1,8 @@
+- job:
+    name: ironic-standalone-zed
+    parent: ironic-standalone
+    override-checkout: stable/zed
+
 - job:
     name: ironic-standalone-yoga
     parent: ironic-standalone
@@ -31,6 +36,11 @@
       devstack_localrc:
         USE_PYTHON3: True
 
+- job:
+    name: ironic-standalone-redfish-zed
+    parent: ironic-standalone
+    override-checkout: stable/zed
+
 - job:
     name: ironic-standalone-redfish-yoga
     parent: ironic-standalone-redfish
@@ -68,6 +78,16 @@
       devstack_localrc:
         USE_PYTHON3: True
 
+- job:
+    name: ironic-standalone-anaconda-2023.1
+    parent: ironic-standalone-anaconda
+    override-checkout: stable/2023.1
+
+- job:
+    name: ironic-tempest-functional-python3-zed
+    parent: ironic-tempest-functional-python3
+    override-checkout: stable/zed
+
 - job:
     name: ironic-tempest-functional-python3-yoga
     parent: ironic-tempest-functional-python3
@@ -98,6 +118,11 @@
     parent: ironic-tempest-functional-python3
     override-checkout: stable/train
 
+- job:
+    name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-zed
+    parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+    override-checkout: stable/zed
+
 - job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-yoga
     parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
@@ -131,6 +156,11 @@
       devstack_localrc:
         USE_PYTHON3: True
 
+- job:
+    name: ironic-inspector-tempest-zed
+    parent: ironic-inspector-tempest
+    override-checkout: stable/zed
+
 - job:
     name: ironic-inspector-tempest-yoga
     parent: ironic-inspector-tempest
@@ -173,6 +203,11 @@
         EBTABLES_RACE_FIX: True
         USE_PYTHON3: True
 
+- job:
+    name: ironic-inspector-tempest-discovery-zed
+    parent: ironic-inspector-tempest-discovery
+    override-checkout: stable/zed
+
 - job:
     name: ironic-inspector-tempest-discovery-yoga
     parent: ironic-inspector-tempest-discovery