From a6321ccd0565d3aa1b56c2df351a13537b45ce30 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 20 Mar 2025 11:59:31 -0700
Subject: [PATCH] Switch to the master constraint in tox.ini

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

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

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

diff --git a/tox.ini b/tox.ini
index 280483b0a7..0fbc252864 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/2025.1}
+    -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/2025.1}
+    -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/2025.1}
+  -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/2025.1}
+  -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
@@ -441,7 +441,7 @@ paths =
 
 [testenv:releasenotes]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1}
+  -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 0589832ceb..2f21c2d4fc 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -127,8 +127,8 @@
         - tempest-full-test-account-py3:
             voting: false
             irrelevant-files: *tempest-irrelevant-files
-        #- ironic-tempest-bios-ipmi-direct-tinyipa:
-        #    irrelevant-files: *tempest-irrelevant-files
+        - ironic-tempest-bios-ipmi-direct-tinyipa:
+            irrelevant-files: *tempest-irrelevant-files
         - openstack-tox-bashate:
             irrelevant-files: *tempest-irrelevant-files-2
     gate:
@@ -160,8 +160,8 @@
         #    irrelevant-files: *tempest-irrelevant-files
         - nova-live-migration:
             irrelevant-files: *tempest-irrelevant-files
-        #- ironic-tempest-bios-ipmi-direct-tinyipa:
-        #    irrelevant-files: *tempest-irrelevant-files
+        - ironic-tempest-bios-ipmi-direct-tinyipa:
+            irrelevant-files: *tempest-irrelevant-files
         # NOTE(gmann): Running jobs on Jammy as per the additional testing
         # for 2025.1 cycle and these can be removed in 2025.2 cycle.
         - tempest-full-ubuntu-jammy: