From d0be9b4218532bb1dd1449c50c75aa64d70edd4c Mon Sep 17 00:00:00 2001
From: can <can@anyscale.com>
Date: Tue, 20 Jun 2023 20:44:57 +0000
Subject: [PATCH] Deprecated jail field

Signed-off-by: can <can@anyscale.com>
---
 release/ray_release/buildkite/filter.py     | 2 --
 release/ray_release/buildkite/step.py       | 9 ++++++---
 release/ray_release/schema.json             | 3 ---
 release/ray_release/tests/test_buildkite.py | 8 ++++----
 release/release_tests.yaml                  | 5 -----
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/release/ray_release/buildkite/filter.py b/release/ray_release/buildkite/filter.py
index 820a837becba..ce0cd13f4232 100644
--- a/release/ray_release/buildkite/filter.py
+++ b/release/ray_release/buildkite/filter.py
@@ -39,8 +39,6 @@ def filter_tests(
         if attr_mismatch:
             continue
         if not run_jailed_tests:
-            if test.get("jailed", False):
-                continue
             clone_test = copy.deepcopy(test)
             clone_test.update_from_s3()
             if clone_test.is_jailed_with_open_issue(TestStateMachine.get_ray_repo()):
diff --git a/release/ray_release/buildkite/step.py b/release/ray_release/buildkite/step.py
index 12997738c263..a2ad8e11dbe0 100644
--- a/release/ray_release/buildkite/step.py
+++ b/release/ray_release/buildkite/step.py
@@ -6,6 +6,7 @@
 from ray_release.buildkite.concurrency import get_concurrency_group
 from ray_release.test import (
     Test,
+    TestState,
     DEFAULT_PYTHON_VERSION,
 )
 from ray_release.config import (
@@ -123,11 +124,13 @@ def get_step(
     if test.get("run", {}).get("type") == "client":
         step["agents"]["queue"] = str(RELEASE_QUEUE_CLIENT)
 
-    # If a test is jailed or not stable, allow to soft fail
+    # If a test is not stable, allow to soft fail
     stable = test.get("stable", True)
-    jailed = test.get("jailed", False)
+    clone_test = copy.deepcopy(test)  # avoid modifying the original test
+    clone_test.update_from_s3()
+    jailed = clone_test.get_state() == TestState.JAILED
     full_label = ""
-    if jailed or not stable:
+    if not stable:
         step["soft_fail"] = True
     if not stable:
         full_label += "[unstable]"
diff --git a/release/ray_release/schema.json b/release/ray_release/schema.json
index a812fd709fbf..48e68c5af2a6 100644
--- a/release/ray_release/schema.json
+++ b/release/ray_release/schema.json
@@ -21,9 +21,6 @@
 				"stable": {
 					"type": "boolean"
 				},
-				"jailed": {
-					"type": "boolean"
-				},
 				"python": {
 					"type": "string",
 					"enum": [
diff --git a/release/ray_release/tests/test_buildkite.py b/release/ray_release/tests/test_buildkite.py
index c65f4b8769be..da8c46de4644 100644
--- a/release/ray_release/tests/test_buildkite.py
+++ b/release/ray_release/tests/test_buildkite.py
@@ -562,7 +562,7 @@ def testGroupTests(self):
         self.assertEqual(len(grouped["y"]), 1)
 
     def testGetStep(self):
-        test = Test(
+        test = MockTest(
             {
                 "name": "test",
                 "frequency": "nightly",
@@ -691,7 +691,7 @@ def testConcurrencyGroupSmokeTest(self):
             with open(cluster_config_smoke_path, "w") as fp:
                 yaml.safe_dump(cluster_config_smoke, fp)
 
-            test = Test(
+            test = MockTest(
                 {
                     "name": "test_1",
                     "cluster": {"cluster_compute": cluster_config_full_path},
@@ -707,14 +707,14 @@ def testConcurrencyGroupSmokeTest(self):
             self.assertEquals(step["concurrency_group"], "small")
 
     def testStepQueueClient(self):
-        test_regular = Test(
+        test_regular = MockTest(
             {
                 "name": "test",
                 "frequency": "nightly",
                 "run": {"script": "test_script.py"},
             }
         )
-        test_client = Test(
+        test_client = MockTest(
             {
                 "name": "test",
                 "frequency": "nightly",
diff --git a/release/release_tests.yaml b/release/release_tests.yaml
index 3f29b3cdb882..c35fcd5c73fd 100644
--- a/release/release_tests.yaml
+++ b/release/release_tests.yaml
@@ -692,7 +692,6 @@
   working_dir: air_tests/air_benchmarks/mlperf-train
 
   stable: false
-  jailed: true
 
   frequency: nightly
   python: "3.8"
@@ -725,7 +724,6 @@
   working_dir: air_tests/air_benchmarks/mlperf-train
 
   stable: false
-  jailed: true
 
   frequency: nightly
   python: "3.8"
@@ -758,7 +756,6 @@
   working_dir: air_tests/air_benchmarks/mlperf-train
 
   stable: false
-  jailed: true
 
   frequency: nightly
   team: data
@@ -4811,7 +4808,6 @@
   working_dir: nightly_tests
 
   stable: false 
-  jailed: true
 
   python: "3.8"
   frequency: nightly
@@ -5064,7 +5060,6 @@
   working_dir: air_tests
 
   stable: false
-  jailed: true
 
   frequency: nightly
   team: core