[CI][Bisect][4] Add pre-sanity check to avoid infra or external change root causes

release/ray_release/scripts/ray_bisect.py

@@ -3,7 +3,7 @@
 import os
 import json
 import time
-from typing import List
+from typing import List, Dict
 from ray_release.logger import logger
 from ray_release.buildkite.step import get_step
 from ray_release.config import (
@@ -19,32 +19,52 @@
 @click.argument("passing_commit", required=True, type=str)
 @click.argument("failing_commit", required=True, type=str)
 def main(test_name: str, passing_commit: str, failing_commit: str) -> None:
+    test = _get_test(test_name)
+    pre_sanity_check = _sanity_check(test, passing_commit, failing_commit)
+    if not pre_sanity_check:
+        logger.info(
+            "Failed pre-saniy check, the test might be flaky or fail due to"
+            " an external (not a code change) factors"
+        )
+        return
     commit_lists = _get_commit_lists(passing_commit, failing_commit)
-    blamed_commit = _bisect(test_name, commit_lists)
+    blamed_commit = _bisect(test, commit_lists)
     logger.info(f"Blamed commit found for test {test_name}: {blamed_commit}")
 
 
-def _bisect(test_name: str, commit_list: List[str]) -> str:
-    test = _get_test(test_name)
+def _bisect(test: Test, commit_list: List[str]) -> str:
     while len(commit_list) > 2:
         logger.info(
             f"Bisecting between {len(commit_list)} commits: "
             f"{commit_list[0]} to {commit_list[-1]}"
         )
         middle_commit_idx = len(commit_list) // 2
         middle_commit = commit_list[middle_commit_idx]
-        is_passing = _run_test(test, middle_commit)
+        is_passing = _run_test(test, [middle_commit])[middle_commit] == "passed"
         if is_passing:
             commit_list = commit_list[middle_commit_idx:]
         else:
             commit_list = commit_list[: middle_commit_idx + 1]
     return commit_list[-1]
 
 
-def _run_test(test: Test, commit: str) -> bool:
-    logger.info(f'Running test {test["name"]} on commit {commit}')
-    _trigger_test_run(test, commit)
-    return _obtain_test_result(commit)
+def _sanity_check(test: Test, passing_revision: str, failing_revision: str) -> bool:
+    logger.info(
+        f"Sanity check passing revision: {passing_revision}"
+        f" and failing revision: {failing_revision}"
+    )
+    outcomes = _run_test(test, [passing_revision, failing_revision])
+    return (
+        outcomes[passing_revision] == "passed"
+        and outcomes[failing_revision] != "passed"
+    )
+
+
+def _run_test(test: Test, commits: List[str]) -> Dict[str, str]:
+    logger.info(f'Running test {test["name"]} on commits {commits}')
+    for commit in commits:
+        _trigger_test_run(test, commit)
+    return _obtain_test_result(commits)
 
 
 def _trigger_test_run(test: Test, commit: str) -> None:
@@ -53,7 +73,7 @@ def _trigger_test_run(test: Test, commit: str) -> None:
         timeout=DEFAULT_WHEEL_WAIT_TIMEOUT,
     )
     step = get_step(test, ray_wheels=ray_wheels_url)
-    step["label"] = f'{test["name"]}:{commit[:6]}'
+    step["label"] = f'{test["name"]}:{commit[:7]}'
     step["key"] = commit
     pipeline = json.dumps({"steps": [step]})
     subprocess.check_output(
@@ -62,20 +82,25 @@ def _trigger_test_run(test: Test, commit: str) -> None:
     )
 
 
-def _obtain_test_result(buildkite_step_key: str) -> bool:
-    outcome = None
+def _obtain_test_result(buildkite_step_keys: List[str]) -> Dict[str, str]:
+    outcomes = {}
     wait = 30
     total_wait = 0
-    while outcome not in ["passed", "hard_failed", "soft_failed"]:
+    while len(outcomes) != len(buildkite_step_keys):
         logger.info(f"... waiting for test result ...({total_wait} seconds)")
-        outcome = subprocess.check_output(
-            f'buildkite-agent step get "outcome" --step "{buildkite_step_key}"',
-            shell=True,
-        ).decode("utf-8")
+        for key in buildkite_step_keys:
+            if key in outcomes:
+                continue
+            outcome = subprocess.check_output(
+                f'buildkite-agent step get "outcome" --step "{key}"',
+                shell=True,
+            ).decode("utf-8")
+            if outcome:
+                outcomes[key] = outcome
         time.sleep(wait)
         total_wait = total_wait + wait
-    logger.info(f"Final test outcome: {outcome}")
-    return outcome == "passed"
+    logger.info(f"Final test outcomes: {outcomes}")
+    return outcomes
 
 
 def _get_test(test_name: str) -> Test:

release/ray_release/tests/test_bisect.py

@@ -1,31 +1,30 @@
 from unittest import mock
+from typing import List, Dict
 from ray_release.scripts.ray_bisect import _bisect
+from ray_release.config import Test
 
 
 def test_bisect():
     test_cases = {
         "c3": {
-            "c0": True,
-            "c1": True,
-            "c3": False,
-            "c4": False,
+            "c0": "passed",
+            "c1": "passed",
+            "c3": "hard_failed",
+            "c4": "soft_failed",
         },
         "c1": {
-            "c0": True,
-            "c1": False,
+            "c0": "passed",
+            "c1": "hard_failed",
         },
     }
 
     for output, input in test_cases.items():
 
-        def _mock_run_test(test_name: str, commit: str) -> bool:
-            return input[commit]
+        def _mock_run_test(test: Test, commit: List[str]) -> Dict[str, str]:
+            return input
 
         with mock.patch(
             "ray_release.scripts.ray_bisect._run_test",
             side_effect=_mock_run_test,
-        ), mock.patch(
-            "ray_release.scripts.ray_bisect._get_test",
-            return_value={},
         ):
-            assert _bisect("test", list(input.keys())) == output
+            assert _bisect({}, list(input.keys())) == output

release/run_release_test.sh

@@ -69,7 +69,11 @@ fi
 if [ -z "${NO_CLONE}" ]; then
   TMPDIR=$(mktemp -d -t release-XXXXXXXXXX)
   echo "Cloning test repo ${RAY_TEST_REPO} branch ${RAY_TEST_BRANCH}"
-  git clone -b "${RAY_TEST_BRANCH}" "${RAY_TEST_REPO}" "${TMPDIR}"
+  if [ -n "${RAY_TEST_COMMIT}" ]; then
+    git clone -b "${RAY_TEST_BRANCH}" "${RAY_TEST_REPO}" "${TMPDIR}"
+  else
+    git clone --depth 1 -b "${RAY_TEST_BRANCH}" "${RAY_TEST_REPO}" "${TMPDIR}"
+  fi
   pushd "${TMPDIR}/release" || true
   HEAD_COMMIT=$(git rev-parse HEAD)
   echo "The cloned test repo has head commit of ${HEAD_COMMIT}"