openstack/swift
Code Issues Proposed changes

CI: run func tests during rolling upgrade job

Browse Source 
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
This commit is contained in:
Tim Burke
2025-05-14 10:02:46 -07:00
parent c12aa812c9
commit 33f409ceba
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.zuul.yaml
View File

@@ -407,6 +407,7 @@
Build a 4 node swift cluster and run functional tests Build a 4 node swift cluster and run functional tests
timeout: 5400 timeout: 5400
vars: vars:
tox_envlist: func
bindep_profile: test py39 bindep_profile: test py39
pre-run: pre-run:
- tools/playbooks/multinode_setup/pre.yaml - tools/playbooks/multinode_setup/pre.yaml
@@ -422,48 +423,56 @@
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: wallaby-eom previous_swift_version: wallaby-eom
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-xena name: swift-multinode-rolling-upgrade-xena
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: xena-eom previous_swift_version: xena-eom
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-yoga name: swift-multinode-rolling-upgrade-yoga
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: yoga-eom previous_swift_version: yoga-eom
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-zed name: swift-multinode-rolling-upgrade-zed
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: zed-eom previous_swift_version: zed-eom
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-antelope name: swift-multinode-rolling-upgrade-antelope
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: 2023.1-eom previous_swift_version: 2023.1-eom
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-bobcat name: swift-multinode-rolling-upgrade-bobcat
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: 2023.2-eol previous_swift_version: 2023.2-eol
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-caracal name: swift-multinode-rolling-upgrade-caracal
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: origin/stable/2024.1 previous_swift_version: origin/stable/2024.1
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-dalmatian name: swift-multinode-rolling-upgrade-dalmatian
parent: swift-multinode-rolling-upgrade parent: swift-multinode-rolling-upgrade
vars: vars:
previous_swift_version: origin/stable/2024.2 previous_swift_version: origin/stable/2024.2
tox_envlist: func-py3
- job: - job:
name: swift-multinode-rolling-upgrade-epoxy name: swift-multinode-rolling-upgrade-epoxy

1
tools/playbooks/multinode_setup/run.yaml
View File

@@ -44,7 +44,6 @@
include_role: include_role:
name: tox name: tox
vars: vars:
tox_envlist: func-py3
tox_environment: tox_environment:
TOX_CONSTRAINTS_FILE: https://releases.openstack.org/constraints/upper/yoga TOX_CONSTRAINTS_FILE: https://releases.openstack.org/constraints/upper/yoga
SWIFT_TEST_CONFIG_FILE: /home/{{ ansible_user }}/test.conf SWIFT_TEST_CONFIG_FILE: /home/{{ ansible_user }}/test.conf