Skip to content

fix(ci): clean up canonical retry reservations #7465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prekshivyas merged 2 commits into from
Jul 24, 2026
Merged

fix(ci): clean up canonical retry reservations #7465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
010d84c
fix(ci): clean up canonical retry reservations
apurvvkumaria Jul 24, 2026
3c4d325
Merge branch 'main' into codex/7146-canonical-retry-cleanup
apurvvkumaria Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions test/pr-e2e-gate-runner-loss-retry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ const JOB_LOG_RANGE_BYTES = 64 * 1024;
const RUNNER_SHUTDOWN_MESSAGE =
"The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.";
const EXIT_143_MESSAGE = "Process completed with exit code 143.";
const RESERVED_CHECK_OUTPUT = {
title: "Waiting for PR CI",
summary:
"This PR SHA and base SHA are reserved for deterministic E2E planning after CI completes.",
};

afterEach(() => {
vi.restoreAllMocks();
Expand Down Expand Up @@ -1093,9 +1098,17 @@ describe("PR E2E one-time hosted-runner-loss retry", () => {
});

it.each([
{ label: "before reservation", replacement: false },
{ label: "after a create response is lost", replacement: true },
])("terminalizes retry setup $label with older retryable history", async ({ replacement }) => {
{ label: "before reservation", replacement: false, replacementDetailsUrl: null },
{ label: "after a lost create response", replacement: true, replacementDetailsUrl: null },
{
label: "after a create response is lost with GitHub's self check URL",
replacement: true,
replacementDetailsUrl: "https://github.com/NVIDIA/NemoClaw/runs/18",
},
])("terminalizes retry setup $label with older retryable history", async ({
replacement,
replacementDetailsUrl,
}) => {
const context = setup();
const requests: RecordedGitHubRequest[] = [];
const older = checkRun(16, {
Expand All @@ -1109,12 +1122,8 @@ describe("PR E2E one-time hosted-runner-loss retry", () => {
const reserved = checkRun(18, {
status: "in_progress",
conclusion: null,
details_url: null,
output: {
title: "Waiting for PR CI",
summary:
"This PR SHA and base SHA are reserved for deterministic E2E planning after CI completes.",
},
details_url: replacementDetailsUrl,
output: RESERVED_CHECK_OUTPUT,
});
const history = replacement ? [older, source, reserved] : [older, source];
vi.spyOn(globalThis, "fetch").mockImplementation(
Expand Down Expand Up @@ -1155,15 +1164,18 @@ describe("PR E2E one-time hosted-runner-loss retry", () => {
}
});

it("rejects an ambiguous retry replacement without mutating either check", async () => {
it.each([
["unexpected owner", null, { title: "Unexpected owner", summary: "Not canonical." }],
["wrong self URL", "https://github.com/NVIDIA/NemoClaw/runs/999", RESERVED_CHECK_OUTPUT],
])("rejects a reserved replacement with %s", async (_label, detailsUrl, output) => {
const context = setup();
const requests: RecordedGitHubRequest[] = [];
const source = checkRun(17);
const ambiguous = checkRun(18, {
status: "in_progress",
conclusion: null,
details_url: null,
output: { title: "Unexpected owner", summary: "Not a canonical reservation." },
details_url: detailsUrl,
output,
});
vi.spyOn(globalThis, "fetch").mockImplementation(
createGitHubFetchRouter(
Expand Down
4 changes: 3 additions & 1 deletion tools/e2e/pr-e2e-gate.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4477,7 +4477,9 @@ export async function abandonRunnerLossRetrySource(
const canonicalReservedReplacement =
current?.status === "in_progress" &&
current.conclusion === null &&
(current.details_url === null || current.details_url === undefined) &&
(current.details_url === null ||
current.details_url === undefined ||
current.details_url === `https://github.com/${repository}/runs/${current.id}`) &&
current.output?.title === RESERVED_CHECK_TITLE &&
current.output.summary === RESERVED_CHECK_SUMMARY;
if (!sourceImmediatelyPrecedesCurrent || !canonicalReservedReplacement) {
Expand Down
Loading