From 6a122ead59e04767420dff9b478b0f1adf5caa10 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 26 Sep 2023 18:53:17 -0700
Subject: [PATCH] Switch to the master constraint in tox.ini

To releas a new tag for Tempest 2023.2, we modified the
compatible constraint in tox.ini
- https://review.opendev.org/c/openstack/tempest/+/874359/1

As new tag is released now so we can switch back to the master
constraint in tox.ini.

Change-Id: I431ec42d81c4d2a95d6f541c794607de1f9cadb8
---
 tox.ini             | 10 +++++-----
 zuul.d/project.yaml |  9 ++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/tox.ini b/tox.ini
index c910b51881..e809f1c914 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ setenv =
     OS_TEST_PATH=./tempest/test_discover
     OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200}
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
 
 [testenv]
@@ -40,7 +40,7 @@ usedevelop = True
 allowlist_externals =
     find
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands =
@@ -337,7 +337,7 @@ commands =
 
 [testenv:venv]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
@@ -351,7 +351,7 @@ commands = {posargs}
 
 [testenv:docs]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-apidoc -f -o doc/source/tests/compute tempest/api/compute
@@ -438,7 +438,7 @@ paths =
 
 [testenv:releasenotes]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf releasenotes/build
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 349ef6476b..469b6595db 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -120,9 +120,6 @@
             voting: false
             irrelevant-files: *tempest-irrelevant-files
         - ironic-tempest-bios-ipmi-direct-tinyipa:
-            # TODO(gmann): make it voting again once this
-            # is merged- https://review.opendev.org/c/openstack/tempest/+/895985
-            voting: false
             irrelevant-files: *tempest-irrelevant-files
         - openstack-tox-bashate:
             irrelevant-files: *tempest-irrelevant-files-2
@@ -153,10 +150,8 @@
         #    irrelevant-files: *tempest-irrelevant-files
         - nova-live-migration:
             irrelevant-files: *tempest-irrelevant-files
-        # TODO(gmann): make it voting again once this
-        # is merged- https://review.opendev.org/c/openstack/tempest/+/895985
-        #- ironic-tempest-bios-ipmi-direct-tinyipa:
-        #    irrelevant-files: *tempest-irrelevant-files
+        - ironic-tempest-bios-ipmi-direct-tinyipa:
+            irrelevant-files: *tempest-irrelevant-files
     experimental:
       jobs:
         - nova-multi-cell