update

Author: KarhouTam

aws/lambda/cross_repo_ci_relay/callback/callback_handler.py

@@ -234,7 +234,7 @@ def _create_upstream_check_run(
             details_url=details_url,
             # Store the downstream run_id so a check-run rerequest can re-run
             # the failed jobs of that workflow run.
-            external_id=str(run_id),
+            external_id=f"{run_id}:{pr_number}" if pr_number else str(run_id),
             output=output,
         )
         logger.info(

aws/lambda/cross_repo_ci_relay/callback/cleanup_handler.py

@@ -118,7 +118,7 @@ def _finalize_timed_out_check_run(
             status="completed",
             conclusion="timed_out",
             details_url=details_url,
-            external_id=run_id,
+            external_id=f"{run_id}:{pr_number}" if pr_number else run_id,
             output=output,
         )
         logger.info(

aws/lambda/cross_repo_ci_relay/tests/test_callback_handler.py

@@ -365,7 +365,7 @@ def test_check_run_external_id_is_run_id(self):
         )
 
         kw = self.mock_gh.create_check_run.call_args[1]
-        self.assertEqual(kw["external_id"], "99999")  # run_id from _body
+        self.assertEqual(kw["external_id"], "99999:42")  # run_id:pr_number
 
     def test_in_progress_callback_creates_check_run(self):
         self.mock_gh.create_check_run.return_value = 999

aws/lambda/cross_repo_ci_relay/tests/test_event_handler.py

@@ -191,7 +191,7 @@ def test_scenario2_in_progress_job_creates_in_progress_check_run(self):
         self.assertEqual(kw["head_sha"], "abc123")
         self.assertEqual(kw["status"], "in_progress")
         self.assertIsNone(kw["conclusion"])
-        self.assertEqual(kw["external_id"], "99999")  # run_id
+        self.assertEqual(kw["external_id"], "99999:42")  # run_id:pr_number
 
     def test_scenario2_backfills_every_job_not_just_one(self):
         """Multi-job workflow: a mid-run label backfills a check run for EVERY
@@ -215,7 +215,7 @@ def test_scenario2_backfills_every_job_not_just_one(self):
             c.kwargs["external_id"]
             for c in self.mock_gh.create_check_run.call_args_list
         }
-        self.assertEqual(external_ids, {"99999"})  # run_id
+        self.assertEqual(external_ids, {"99999:42"})  # run_id:pr_number
 
     def test_scenario3_completed_job_creates_completed_check_run(self):
         """Scenario 3: label arrives after workflow completed → create completed CR directly."""

aws/lambda/cross_repo_ci_relay/webhook/event_handler.py

@@ -205,7 +205,7 @@ def _handle_pr_labeled(config: RelayConfig, payload: dict) -> dict:
                     status=job_status,
                     conclusion=(job_conclusion if job_status == "completed" else None),
                     details_url=details_url,
-                    external_id=str(run_id),
+                    external_id=f"{run_id}:{pr_number}" if pr_number else str(run_id),
                     output=gh_helper.build_check_run_output(
                         job_status,
                         job_conclusion,
@@ -267,7 +267,7 @@ def _handle_check_run_rerequested(config: RelayConfig, payload: dict) -> dict:
     """
     check_run = payload.get("check_run") or {}
     name = check_run.get("name", "")
-    run_id = check_run.get("external_id") or ""
+    run_id = (check_run.get("external_id") or "").split(":")[0]
     downstream_repo = _downstream_repo_from_check_run(name)
     if not downstream_repo or not run_id:
         return {"ignored": True, "reason": "not a crcr check run"}
@@ -350,7 +350,7 @@ def _handle_check_suite_rerequested(config: RelayConfig, payload: dict) -> dict:
     rerun: list[str] = []
     for check_run in check_runs:
         downstream_repo = _downstream_repo_from_check_run(check_run.get("name", ""))
-        run_id = check_run.get("external_id") or ""
+        run_id = (check_run.get("external_id") or "").split(":")[0]
         if not downstream_repo or not run_id:
             continue
         if (downstream_repo, run_id) in seen:

torchci/lib/bot/crcrOncallBot.ts

@@ -83,10 +83,10 @@ export default function crcrOncallBot(app: Probot): void {
     let prNumbers: number[] = [];
     if (checkRun.pull_requests && checkRun.pull_requests.length > 0) {
       prNumbers = checkRun.pull_requests.map((pr) => pr.number);
-    } else if (checkRun.output?.summary) {
-      const match = checkRun.output.summary.match(/for PR (\d+)/);
-      if (match) {
-        prNumbers = [parseInt(match[1], 10)];
+    } else if (checkRun.external_id) {
+      const parts = checkRun.external_id.split(":");
+      if (parts.length === 2 && parts[1]) {
+        prNumbers = [parseInt(parts[1], 10)];
       }
     }
 

torchci/test/crcrOncallBot.test.ts

@@ -176,23 +176,20 @@ L3:
     });
   });
 
-  test("does not comment when output has no PR number", async () => {
-    // output.summary exists but regex doesn't match (no PR number
-    // after "for PR"), so the bot returns early without any API call.
+  test("does not comment when external_id has no PR number", async () => {
+    // external_id carries bare run_id (no ":" separator) when pr_number
+    // is unavailable — the bot returns early without any API call.
     await probot.receive({
       name: "check_run" as any,
       payload: checkRunPayload({
         pull_requests: [],
-        output: {
-          title: "In progress",
-          summary: "intel/torch-xpu-ops workflow for PR : https://example.com",
-        },
+        external_id: "12345",
       }) as any,
       id: "8",
     });
   });
 
-  test("posts comment when output contains PR number for cross-fork PR", async () => {
+  test("posts comment when external_id contains PR number for cross-fork PR", async () => {
     const scope = nock("https://api.github.com")
       .get(`/repos/${OWNER}/${REPO}/issues/${PR_NUMBER}/comments`)
       .reply(200, [])
@@ -212,10 +209,7 @@ L3:
       name: "check_run" as any,
       payload: checkRunPayload({
         pull_requests: [], // empty — simulates cross-fork PR
-        output: {
-          title: "Failure",
-          summary: `intel/torch-xpu-ops workflow for PR ${PR_NUMBER}: https://example.com`,
-        },
+        external_id: `12345:${PR_NUMBER}`,
       }) as any,
       id: "10",
     });