fix(test): mount upgrade survivor helper

vincentkoc · vincentkoc · commit 5f0315467bce · 2026-05-24T18:59:34.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Docs: https://docs.openclaw.ai
 ### Fixes
 
 - Channels/iMessage: advance the startup catchup cursor from live-handled rows after a completed catchup pass, including rows received while catchup is still running, so restarts do not replay them. (#85475) Thanks @TurboTheTurtle.
+- Tests: mount the shared Windows command helper into bare Docker E2E harness containers so published upgrade-survivor config walks can start on Linux.
 - Tests: keep kitchen-sink plugin assertion fixtures on a configurable temp root so native Windows runs no longer skip full-surface diagnostic coverage.
 - Tests: fail Gateway startup benchmarks when a child startup never produces ready probes or process metrics instead of reporting all `n/a` samples as passing.
 - Config/secrets: allow exec SecretRef ids to include `#` selectors so AWS-style `secret#json_key` ids validate consistently. (#80731) Thanks @TurboTheTurtle.
diff --git a/scripts/lib/docker-e2e-package.sh b/scripts/lib/docker-e2e-package.sh
@@ -60,7 +60,11 @@ docker_e2e_package_mount_args() {
 }
 
 docker_e2e_harness_mount_args() {
-  DOCKER_E2E_HARNESS_ARGS=(-v "$ROOT_DIR/scripts/e2e:/app/scripts/e2e:ro" -v "$ROOT_DIR/scripts/lib:/app/scripts/lib:ro")
+  DOCKER_E2E_HARNESS_ARGS=(
+    -v "$ROOT_DIR/scripts/e2e:/app/scripts/e2e:ro"
+    -v "$ROOT_DIR/scripts/lib:/app/scripts/lib:ro"
+    -v "$ROOT_DIR/scripts/windows-cmd-helpers.mjs:/app/scripts/windows-cmd-helpers.mjs:ro"
+  )
 }
 
 docker_e2e_run_with_harness() {
diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts
@@ -6,6 +6,7 @@ import { describe, expect, it } from "vitest";
 
 const HELPER_PATH = "scripts/lib/docker-build.sh";
 const DOCKER_ALL_SCHEDULER_PATH = "scripts/test-docker-all.mjs";
+const DOCKER_E2E_PACKAGE_HELPER_PATH = "scripts/lib/docker-e2e-package.sh";
 const DOCKER_E2E_IMAGE_HELPER_PATH = "scripts/lib/docker-e2e-image.sh";
 const DOCKER_E2E_SCENARIOS_PATH = "scripts/lib/docker-e2e-scenarios.mjs";
 const INSTALL_E2E_RUNNER_PATH = "scripts/docker/install-sh-e2e/run.sh";
@@ -124,6 +125,14 @@ describe("docker build helper", () => {
     }
   });
 
+  it("mounts root helper modules imported by bare Docker E2E scripts", () => {
+    const helper = readFileSync(DOCKER_E2E_PACKAGE_HELPER_PATH, "utf8");
+
+    expect(helper).toContain(
+      '-v "$ROOT_DIR/scripts/windows-cmd-helpers.mjs:/app/scripts/windows-cmd-helpers.mjs:ro"',
+    );
+  });
+
   it("preserves pnpm lookup paths for scheduled Docker child lanes", () => {
     const scheduler = readFileSync(DOCKER_ALL_SCHEDULER_PATH, "utf8");
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,11 @@ docker_e2e_package_mount_args() {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`docker_e2e_harness_mount_args() {`
`63`		`- DOCKER_E2E_HARNESS_ARGS=(-v "$ROOT_DIR/scripts/e2e:/app/scripts/e2e:ro" -v "$ROOT_DIR/scripts/lib:/app/scripts/lib:ro")`
	`63`	`+ DOCKER_E2E_HARNESS_ARGS=(`
	`64`	`+ -v "$ROOT_DIR/scripts/e2e:/app/scripts/e2e:ro"`
	`65`	`+ -v "$ROOT_DIR/scripts/lib:/app/scripts/lib:ro"`
	`66`	`+ -v "$ROOT_DIR/scripts/windows-cmd-helpers.mjs:/app/scripts/windows-cmd-helpers.mjs:ro"`
	`67`	`+ )`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`docker_e2e_run_with_harness() {`