From c48c3ecbc75de38c0cfa345094f7e6c6dbaf5331 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Fri, 1 May 2026 00:35:29 -0700
Subject: [PATCH] fix(e2e): isolate upgrade survivor matrix artifacts

---
 scripts/lib/docker-e2e-plan.mjs      | 1 +
 test/scripts/docker-e2e-plan.test.ts | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/scripts/lib/docker-e2e-plan.mjs b/scripts/lib/docker-e2e-plan.mjs
index 234ef7ae1d6..b767aea253b 100644
--- a/scripts/lib/docker-e2e-plan.mjs
+++ b/scripts/lib/docker-e2e-plan.mjs
@@ -168,6 +168,7 @@ export function expandUpgradeSurvivorBaselineLanes(poolLanes, rawBaselineSpecs,
         const suffix = suffixParts.join("-");
         const name = suffix ? `${poolLane.name}-${suffix}` : poolLane.name;
         const commandPrefix = [
+          `OPENCLAW_UPGRADE_SURVIVOR_ARTIFACT_DIR="$PWD/.artifacts/upgrade-survivor/${name}"`,
           baselineSpec ? `OPENCLAW_UPGRADE_SURVIVOR_BASELINE_SPEC=${shellQuote(baselineSpec)}` : "",
           scenario ? `OPENCLAW_UPGRADE_SURVIVOR_SCENARIO=${shellQuote(scenario)}` : "",
         ]
diff --git a/test/scripts/docker-e2e-plan.test.ts b/test/scripts/docker-e2e-plan.test.ts
index fe38ae99dfa..8b96d072c66 100644
--- a/test/scripts/docker-e2e-plan.test.ts
+++ b/test/scripts/docker-e2e-plan.test.ts
@@ -382,6 +382,9 @@ describe("scripts/lib/docker-e2e-plan", () => {
         ),
       }),
     ]);
+    expect(plan.lanes[0]?.command).toContain(
+      'OPENCLAW_UPGRADE_SURVIVOR_ARTIFACT_DIR="$PWD/.artifacts/upgrade-survivor/published-upgrade-survivor-2026.4.29"',
+    );
   });
 
   it("expands the published upgrade survivor lane across scenarios", () => {
@@ -409,6 +412,12 @@ describe("scripts/lib/docker-e2e-plan", () => {
         }),
       ]),
     );
+    expect(
+      plan.lanes.find((lane) => lane.name === "published-upgrade-survivor-2026.4.29-tilde-log-path")
+        ?.command,
+    ).toContain(
+      'OPENCLAW_UPGRADE_SURVIVOR_ARTIFACT_DIR="$PWD/.artifacts/upgrade-survivor/published-upgrade-survivor-2026.4.29-tilde-log-path"',
+    );
   });
 
   it("expands reported upgrade issue scenarios", () => {