From 8ab9d32c4f94c6cdbfd0c89a57d62da33e622dbd Mon Sep 17 00:00:00 2001
From: Roman Popelka <rpopelka@redhat.com>
Date: Wed, 26 Apr 2023 12:57:08 +0200
Subject: [PATCH] Fix tox<4 issue for zed job

Added task to install proper version
of tox(<4) so the job won't fail and
set the job as voting again

Story: 2010573
Change-Id: I0e9ad3632d16a5aa8c0e98d3e0d10bee79cead99
---
 .zuul.yaml                                         |  3 +--
 playbooks/python-tempestconf-tempest-devstack.yaml | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 26def0e9..4fa03617 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,8 +10,7 @@
         - python-tempestconf-tempest-devstack-admin-yoga
         # temporarily marked to n-v, there is a bug
         # https://storyboard.openstack.org/#!/story/2010573
-        - python-tempestconf-tempest-devstack-admin-zed:
-            voting: false
+        - python-tempestconf-tempest-devstack-admin-zed
         - python-tempestconf-tempest-devstack-demo
         - python-tempestconf-tempest-devstack-admin-plugins
         - python-tempestconf-tempest-devstack-enforce-scope-new-defaults-admin
diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml
index 9539ae82..cfdad11b 100644
--- a/playbooks/python-tempestconf-tempest-devstack.yaml
+++ b/playbooks/python-tempestconf-tempest-devstack.yaml
@@ -2,6 +2,16 @@
   roles:
     # the role is inherited from openstack/devstack project
     - run-devstack
+  tasks:
+    - name: Python-tempestconf tox<4 workaround
+      shell: |
+        python3 -m pip install "tox{{ ensure_tox_version }}"
+      args:
+        executable: /bin/bash
+      become: true
+      when:
+        - branch is defined
+        - branch in ["stable/zed"]
 
 - hosts: tempest
   vars: