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
Signed-off-by: Tim Burke <tim.burke@gmail.com>
Change-Id: Ibbb8c305a8b8bac7ca1a8853208cd031957adac1
(cherry picked from commit 33f409ceba)

.zuul.yaml

@@ -398,6 +398,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
@@ -413,48 +414,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: origin/stable/2023.2
+      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-master

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