From 59305c8d3d19076d19562b68848b99c912ce3eab Mon Sep 17 00:00:00 2001
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Tue, 25 Oct 2022 12:12:13 +0300
Subject: [PATCH] Update zuul queue configuration

Zuul changed the way in which queues have to be declared [1][2].
We'll update the os-win zuul configuration accordingly.

We're also updating the sphinx requirement to match the one
from the global requirements file, otherwise the requirements job
fails.

[1] https://lists.zuul-ci.org/pipermail/zuul-discuss/2022-May/001801.html
[2] https://lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html

Change-Id: I9b443aba106df12de5a8d215a0d88843bfecddf7
(cherry picked from commit e18d57e319b8dbb96540c460a81813a5054ddc6f)
---
 .zuul.yaml            | 3 +--
 test-requirements.txt | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 305cc892..0830544f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,5 +4,4 @@
       - openstack-python35-jobs
       - check-requirements
       - release-notes-jobs
-    gate:
-      queue: os-win
+    queue: os-win
diff --git a/test-requirements.txt b/test-requirements.txt
index b8937f8f..8fd88f18 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,8 @@ coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 python-subunit>=1.0.0 # Apache-2.0/BSD
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx>=1.6.2,!=1.6.6,<2.0.0;python_version=='2.7'  # BSD
+sphinx>=1.6.2,!=1.6.6;python_version>='3.4'  # BSD
 oslo.config>=5.1.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD