diff --git a/tests/runner-e2e/controller-outage.ts b/tests/runner-e2e/controller-outage.ts index 32ec972c938..758f80a8c33 100644 --- a/tests/runner-e2e/controller-outage.ts +++ b/tests/runner-e2e/controller-outage.ts @@ -3,6 +3,7 @@ import type { ServingArtifact } from "./upgrade-artifacts.js"; import type { ControllerRecoveryReceipt } from "./controller-recovery-observer.js"; import { setTimeout as delay } from "node:timers/promises"; import type { MatrixExecution } from "./types.js"; +import { isRollingWebDeployment } from "./controller-rolling-deployment.js"; export interface ControllerOutage { signal: "SIGTERM" | "SIGKILL"; @@ -40,7 +41,7 @@ export function configuredControllerOutage(env: NodeJS.ProcessEnv, defaultHoldMs } export function controllerOutageForExecution(execution: MatrixExecution, env: NodeJS.ProcessEnv): ControllerOutage | undefined { - if (execution.suite.id === "rolling-web-deployment") return undefined; + if (isRollingWebDeployment(execution)) return undefined; if (execution.task.flow !== "everyday_workflow" || execution.task.id !== "recover-controller" || execution.environment.id !== "daytona" || execution.profile.generation !== "native" || (execution.profile.provider !== "codex" && execution.profile.provider !== "acpx")) return undefined; diff --git a/tests/runner-e2e/controller-rolling-deployment.test.ts b/tests/runner-e2e/controller-rolling-deployment.test.ts index f8c588bdecf..7a7e6c5815a 100644 --- a/tests/runner-e2e/controller-rolling-deployment.test.ts +++ b/tests/runner-e2e/controller-rolling-deployment.test.ts @@ -85,5 +85,8 @@ describe("rolling controller qualification", () => { .toEqual(new Set(warmIds.has(profile.id) ? ["per_turn", "warm-controller-outage-v1"] : ["per_turn"])); } expect(executions.every(execution => execution.suite.definitionMetadata?.retainedControllerContinuation === true)).toBe(true); + for (const execution of executions) { + expect(controllerOutageForExecution(execution, {})).toBeUndefined(); + } }); });