fix(e2e): bound logged onboard commands

vincentkoc · vincentkoc · commit b74984dd5069 · 2026-05-27T03:41:52.000+02:00
diff --git a/scripts/e2e/onboard-docker.sh b/scripts/e2e/onboard-docker.sh
@@ -8,6 +8,7 @@ OPENCLAW_TEST_STATE_FUNCTION_B64="$(docker_e2e_test_state_function_b64)"
 MAX_MEMORY_MIB="${OPENCLAW_ONBOARD_MAX_MEMORY_MIB:-2048}"
 MAX_CPU_PERCENT="${OPENCLAW_ONBOARD_MAX_CPU_PERCENT:-1200}"
 DOCKER_RUN_TIMEOUT="${OPENCLAW_ONBOARD_DOCKER_RUN_TIMEOUT:-1200s}"
+COMMAND_TIMEOUT="${OPENCLAW_ONBOARD_COMMAND_TIMEOUT:-${OPENCLAW_E2E_COMMAND_TIMEOUT:-300s}}"
 CONTAINER_NAME="openclaw-onboard-e2e-$$"
 RUN_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-onboard.XXXXXX")"
 STATS_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-onboard-stats.XXXXXX")"
@@ -25,6 +26,7 @@ docker_e2e_docker_cmd rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
 docker_e2e_harness_mount_args
 DOCKER_COMMAND_TIMEOUT="$DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" -t \
   -e "OPENCLAW_TEST_STATE_FUNCTION_B64=$OPENCLAW_TEST_STATE_FUNCTION_B64" \
+  -e "OPENCLAW_E2E_COMMAND_TIMEOUT=$COMMAND_TIMEOUT" \
   "$IMAGE_NAME" bash scripts/e2e/lib/onboard/scenario.sh >"$RUN_LOG" 2>&1 &
 docker_pid="$!"
 
diff --git a/scripts/lib/openclaw-e2e-instance.sh b/scripts/lib/openclaw-e2e-instance.sh
@@ -332,7 +332,8 @@ openclaw_e2e_assert_log_not_contains() {
 openclaw_e2e_run_logged() {
   local label="$1" log_path="/tmp/openclaw-onboard-${1}.log"
   shift
-  "$@" >"$log_path" 2>&1 || { cat "$log_path"; exit 1; }
+  local timeout_value="${OPENCLAW_E2E_COMMAND_TIMEOUT:-300s}"
+  openclaw_e2e_maybe_timeout "$timeout_value" "$@" >"$log_path" 2>&1 || { cat "$log_path"; exit 1; }
 }
 openclaw_e2e_dump_logs() {
   local path
diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts
@@ -1128,6 +1128,10 @@ test -f "$TMPDIR/docker-cmd-seen"
 
     expect(runner).toContain("OPENCLAW_ONBOARD_MAX_MEMORY_MIB");
     expect(runner).toContain("OPENCLAW_ONBOARD_MAX_CPU_PERCENT");
+    expect(runner).toContain(
+      'COMMAND_TIMEOUT="${OPENCLAW_ONBOARD_COMMAND_TIMEOUT:-${OPENCLAW_E2E_COMMAND_TIMEOUT:-300s}}"',
+    );
+    expect(runner).toContain('-e "OPENCLAW_E2E_COMMAND_TIMEOUT=$COMMAND_TIMEOUT"');
     expect(runner).toContain('--name "$CONTAINER_NAME"');
     expect(runner).toContain("docker_e2e_docker_cmd stats --no-stream");
     expect(runner).toContain("assert-resource-ceiling.mjs");
diff --git a/test/scripts/openclaw-e2e-instance.test.ts b/test/scripts/openclaw-e2e-instance.test.ts
@@ -321,4 +321,69 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
       fs.rmSync(tempDir, { force: true, recursive: true });
     }
   });
+
+  it("wraps logged OpenClaw E2E commands with the configured timeout", () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-e2e-instance-run-logged-"));
+    const logLabel = path.basename(tempDir);
+    const logPath = `/tmp/openclaw-onboard-${logLabel}.log`;
+    try {
+      const timeoutArgsPath = path.join(tempDir, "timeout-args.txt");
+      const commandArgsPath = path.join(tempDir, "command-args.txt");
+      fs.writeFileSync(
+        path.join(tempDir, "timeout"),
+        [
+          "#!/usr/bin/env bash",
+          "set -euo pipefail",
+          'printf "%s\\n" "$*" >"$OPENCLAW_TEST_TIMEOUT_ARGS"',
+          'while [ "$#" -gt 0 ] && [ "$1" != "fixture-command" ]; do shift; done',
+          'exec "$@"',
+          "",
+        ].join("\n"),
+      );
+      fs.writeFileSync(
+        path.join(tempDir, "fixture-command"),
+        [
+          "#!/usr/bin/env bash",
+          "set -euo pipefail",
+          'printf "%s\\n" "$*" >"$OPENCLAW_TEST_COMMAND_ARGS"',
+          'printf "fixture output\\n"',
+          "",
+        ].join("\n"),
+      );
+      fs.chmodSync(path.join(tempDir, "timeout"), 0o755);
+      fs.chmodSync(path.join(tempDir, "fixture-command"), 0o755);
+
+      const result = spawnSync(
+        "/bin/bash",
+        [
+          "-c",
+          [
+            "set -euo pipefail",
+            `source ${shellQuote(helperPath)}`,
+            `openclaw_e2e_run_logged ${shellQuote(logLabel)} fixture-command one two`,
+          ].join("; "),
+        ],
+        {
+          encoding: "utf8",
+          env: {
+            ...process.env,
+            PATH: `${tempDir}:${process.env.PATH ?? ""}`,
+            OPENCLAW_E2E_COMMAND_TIMEOUT: "17s",
+            OPENCLAW_TEST_TIMEOUT_ARGS: timeoutArgsPath,
+            OPENCLAW_TEST_COMMAND_ARGS: commandArgsPath,
+          },
+        },
+      );
+
+      expect(result.status).toBe(0);
+      expect(fs.readFileSync(timeoutArgsPath, "utf8").trim()).toBe(
+        "--kill-after=30s 17s fixture-command one two",
+      );
+      expect(fs.readFileSync(commandArgsPath, "utf8").trim()).toBe("one two");
+      expect(fs.readFileSync(logPath, "utf8")).toContain("fixture output");
+    } finally {
+      fs.rmSync(tempDir, { force: true, recursive: true });
+      fs.rmSync(logPath, { force: true });
+    }
+  });
 });
