diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-21 01:23:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-21 01:23:28 +0000 |
| commit | 9afd3103e71bfb6ff9f58032ddfde95c22e90091 (patch) | |
| tree | 5facc0ac1e17172b0f07dc2273d945c43c519986 | |
| parent | 4ee566aa2992bfded7d881c9ae71f3267ada8ce8 (diff) | |
| parent | 1ab1f9c9a2dafcec6901c458bea33d1f40da3357 (diff) | |
| download | swift-9afd3103e71bfb6ff9f58032ddfde95c22e90091.tar.gz | |
Merge "[stable-only] Pin tox<4 for stable branches (<=stable/zed) testing" into stable/victoria
| -rw-r--r-- | tools/playbooks/dsvm/pre.yaml | 8 | ||||
| -rw-r--r-- | tools/playbooks/multinode_setup/pre.yaml | 8 |
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" |