From 33f409ceba9a22f8067ea5b10317f7b9a8d3f705 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Wed, 14 May 2025 10:02:46 -0700
Subject: [PATCH] CI: run func tests during rolling upgrade job

We recently removed the "func-py3" tox env in favor of just "func" -- as a
result, this went back to running unit tests!

Keep "func-py3" for older releases where that tox env *is* still defined,
though, as they won't have py27 around to run "func".

Related-Change: I53153c4fde043e964e1daa7bbf2089e0471dede2
Change-Id: Ibbb8c305a8b8bac7ca1a8853208cd031957adac1
---
 .zuul.yaml                               | 9 +++++++++
 tools/playbooks/multinode_setup/run.yaml | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8a29bb836c..3c2cf7af78 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -407,6 +407,7 @@
       Build a 4 node swift cluster and run functional tests
     timeout: 5400
     vars:
+      tox_envlist: func
       bindep_profile: test py39
     pre-run:
       - tools/playbooks/multinode_setup/pre.yaml
@@ -422,48 +423,56 @@
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: wallaby-eom
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-xena
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: xena-eom
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-yoga
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: yoga-eom
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-zed
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: zed-eom
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-antelope
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: 2023.1-eom
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-bobcat
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: 2023.2-eol
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-caracal
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: origin/stable/2024.1
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-dalmatian
     parent: swift-multinode-rolling-upgrade
     vars:
       previous_swift_version: origin/stable/2024.2
+      tox_envlist: func-py3
 
 - job:
     name: swift-multinode-rolling-upgrade-epoxy
diff --git a/tools/playbooks/multinode_setup/run.yaml b/tools/playbooks/multinode_setup/run.yaml
index 6682ee1e7b..a842a36236 100644
--- a/tools/playbooks/multinode_setup/run.yaml
+++ b/tools/playbooks/multinode_setup/run.yaml
@@ -44,7 +44,6 @@
       include_role:
         name: tox
       vars:
-        tox_envlist: func-py3
         tox_environment:
           TOX_CONSTRAINTS_FILE: https://releases.openstack.org/constraints/upper/yoga
           SWIFT_TEST_CONFIG_FILE: /home/{{ ansible_user }}/test.conf