summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhanshyam Mann <gmann@ghanshyammann.com>2023-01-06 20:35:58 -0600
committerGhanshyam Mann <gmann@ghanshyammann.com>2023-01-06 20:55:02 -0600
commit1ab1f9c9a2dafcec6901c458bea33d1f40da3357 (patch)
tree7e795f21001f01563e909cee00cba9e8499f9753
parent4ca7bdf93d471435278e0c1a3b1486f18fd67c0c (diff)
downloadswift-1ab1f9c9a2dafcec6901c458bea33d1f40da3357.tar.gz
[stable-only] Pin tox<4 for stable branches (<=stable/zed) testing
tox4 need changes in tox.ini file to be compatible with it. Those are ok to fix in master brnanch but on stable branches testing we do not need to fix them and should keep running the tox which was used in when those stable was released. - https://lists.openstack.org/pipermail/openstack-discuss/2023-January/031668.html It is pinned same way in devstack side too - https://review.opendev.org/q/I9a138af94dedc0d8ce5a0d519d75779415d3c30b This only pin for jobs running for stable branches <=stable/zed. Conflicts: this file is not present in stable/yoga and less - tools/playbooks/s3api-tests/run.yaml Change-Id: I8b4527ffff557ab227910816a729579c06557911 (cherry picked from commit a2d363de61718d4b5a15e2c553946b71cd2464ed) (cherry picked from commit 8cf39653dc812a13bfcaf788512bb0e2cf5c8c49) (cherry picked from commit 8aface90d936e58c7cdc4f896cef62e887706e63) (cherry picked from commit 598f44320d082ce57aafff439ed460f9bae81051)
-rw-r--r--tools/playbooks/dsvm/pre.yaml8
-rw-r--r--tools/playbooks/multinode_setup/pre.yaml8
2 files changed, 14 insertions, 2 deletions
diff --git a/tools/playbooks/dsvm/pre.yaml b/tools/playbooks/dsvm/pre.yaml
index 23c6ec2d2..0c7efcb66 100644
--- a/tools/playbooks/dsvm/pre.yaml
+++ b/tools/playbooks/dsvm/pre.yaml
@@ -6,7 +6,13 @@
bindep_profile: test
bindep_dir: "{{ zuul_work_dir }}"
- test-setup
- - ensure-tox
+ # NOTE(gmann): Pinning tox<4.0.0 for stable/zed and lower. Tox 4.0.0
+ # released after zed was released and has some incompatible changes
+ # and it is ok not to fix the issues caused by tox 4.0.0 in stable
+ # beanches jobs. We can continue testing the stable/zed and lower
+ # branches with tox<4.0.0
+ - role: ensure-tox
+ ensure_tox_version: "<4"
- additional-tempauth-users
- additional-keystone-users
- dsvm-additional-middlewares
diff --git a/tools/playbooks/multinode_setup/pre.yaml b/tools/playbooks/multinode_setup/pre.yaml
index d7e4670a8..68d525425 100644
--- a/tools/playbooks/multinode_setup/pre.yaml
+++ b/tools/playbooks/multinode_setup/pre.yaml
@@ -5,4 +5,10 @@
bindep_profile: test
bindep_dir: "{{ zuul_work_dir }}"
- test-setup
- - ensure-tox
+ # NOTE(gmann): Pinning tox<4.0.0 for stable/zed and lower. Tox 4.0.0
+ # released after zed was released and has some incompatible changes
+ # and it is ok not to fix the issues caused by tox 4.0.0 in stable
+ # beanches jobs. We can continue testing the stable/zed and lower
+ # branches with tox<4.0.0
+ - role: ensure-tox
+ ensure_tox_version: "<4"