From 22022ccc58b6e4bd4977bd1255d6f0ca3b5ea116 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Wed, 13 Nov 2024 10:20:49 +0530
Subject: [PATCH] [Xena Jobs] use 'full' tox env

With [1] Xena is being pinned to 33.0.0 and that version
don't have 'multinode' and 'integrated-full' tox envs,
so using 'full'. xena-last tag which have both these envs
can't be used due to[2][3].

Also exclude DHCPAgentSchedulersTestJSON and Multiattach tests as
[4][5] missing in tempest-33.0.0.

[1] https://review.opendev.org/c/openstack/devstack/+/933741
[2] https://review.opendev.org/c/openstack/tempest/+/821732
[3] https://review.opendev.org/c/openstack/tempest/+/873442
[4] https://review.opendev.org/c/openstack/tempest/+/898090
[5] https://review.opendev.org/c/openstack/tempest/+/875372

Needed-By: https://review.opendev.org/c/openstack/devstack/+/933741
Change-Id: I5e82704ae81e5c0ef016fac02d153d6ed003d12b
---
 zuul.d/stable-jobs.yaml | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index f3e38eedb9..efa771e7fa 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -57,10 +57,11 @@
     name: tempest-full-py3
     parent: devstack-tempest
     # This job version is to use the 'full' tox env which
-    # is available for stable/ussuri to stable/wallaby also.
+    # is available for unmaintained/victoria to unmaintained/xena also.
     branches:
       - ^.*/victoria
       - ^.*/wallaby
+      - ^.*/xena
     description: |
       Base integration test with Neutron networking, horizon, swift enable,
       and py3.
@@ -71,6 +72,10 @@
       - openstack/horizon
     vars:
       tox_envlist: full
+      tempest_exclude_regex: "\
+          (DHCPAgentSchedulersTestJSON)|\
+          (AttachVolumeMultiAttachTest)|\
+          (UpdateMultiattachVolumeNegativeTest)"
       devstack_localrc:
         USE_PYTHON3: true
         FORCE_CONFIG_DRIVE: true
@@ -109,11 +114,30 @@
     name: tempest-multinode-full
     parent: tempest-multinode-full-base
     nodeset: openstack-two-node-focal
-    # This job runs on Focal and on python2. This is for unmaintained/victoria to unmaintained/zed.
+    # This job runs on Focal and on python2. This is for unmaintained/victoria to unmaintained/xena.
     branches:
       - ^.*/victoria
       - ^.*/wallaby
       - ^.*/xena
+    vars:
+      tox_envlist: full
+      tempest_exclude_regex: "\
+          (DHCPAgentSchedulersTestJSON)|\
+          (AttachVolumeMultiAttachTest)|\
+          (UpdateMultiattachVolumeNegativeTest)"
+      devstack_localrc:
+        USE_PYTHON3: False
+    group-vars:
+      subnode:
+        devstack_localrc:
+          USE_PYTHON3: False
+
+- job:
+    name: tempest-multinode-full
+    parent: tempest-multinode-full-base
+    nodeset: openstack-two-node-focal
+    # This job runs on Focal and on python2. This is for unmaintained/yoga to unmaintained/zed.
+    branches:
       - ^.*/yoga
       - ^.*/zed
     vars: