From 3eb6e2d737e6acbbcfda381656c5fa464851b925 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 6 Jan 2023 12:20:34 -0600 Subject: [PATCH] [stable-only] Pin tox<4 in run-both.yaml playbook also We pinned tox<4 in ensure-tox pre.yaml playbook - https://review.opendev.org/q/I9a138af94dedc0d8ce5a0d519d75779415d3c30b but did not realize that it is used in run-both.yaml playbook also where we should pin too. Change-Id: I4407f7036e3fd51ac79f68791151c3f9cd03bd01 (cherry picked from commit 689b399e3a445c47368b9a17e428ab120f591d7b) (cherry picked from commit ff4cd115cc437e966db3717e1b94ff536e71b39e) (cherry picked from commit f895418f860309d9fc7c7acc8afa578739667520) (cherry picked from commit 7fce80880f6f26f16cba1a38365dcc884671d3c4) --- playbooks/tox/run-both.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/playbooks/tox/run-both.yaml b/playbooks/tox/run-both.yaml index e4043d8231..0f8af920e4 100644 --- a/playbooks/tox/run-both.yaml +++ b/playbooks/tox/run-both.yaml @@ -6,6 +6,12 @@ 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" - get-devstack-os-environment - tox