From a2d363de61718d4b5a15e2c553946b71cd2464ed Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 6 Jan 2023 20:35:58 -0600 Subject: [PATCH] [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. Change-Id: I8b4527ffff557ab227910816a729579c06557911 --- tools/playbooks/dsvm/pre.yaml | 8 +++++++- tools/playbooks/multinode_setup/pre.yaml | 8 +++++++- tools/playbooks/s3api-tests/run.yaml | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/playbooks/dsvm/pre.yaml b/tools/playbooks/dsvm/pre.yaml index 23c6ec2d2d..0c7efcb66e 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 55eb8d1991..daa7da0731 100644 --- a/tools/playbooks/multinode_setup/pre.yaml +++ b/tools/playbooks/multinode_setup/pre.yaml @@ -4,4 +4,10 @@ - role: bindep 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" diff --git a/tools/playbooks/s3api-tests/run.yaml b/tools/playbooks/s3api-tests/run.yaml index d73c2d840f..ea1fbf72c6 100644 --- a/tools/playbooks/s3api-tests/run.yaml +++ b/tools/playbooks/s3api-tests/run.yaml @@ -14,7 +14,13 @@ # limitations under the License. - hosts: all roles: - - 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" tasks: - name: Run s3api tests include_role: