fix(e2e): bound resource-sampled docker runs · openclaw/openclaw@d0dd8b8
vincentkoc
·
2026-05-26
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -24,6 +24,7 @@ SCENARIOS
|
24 | 24 | KITCHEN_SINK_SCENARIOS="${OPENCLAW_KITCHEN_SINK_PLUGIN_SCENARIOS:-$DEFAULT_KITCHEN_SINK_SCENARIOS}" |
25 | 25 | MAX_MEMORY_MIB="${OPENCLAW_KITCHEN_SINK_MAX_MEMORY_MIB:-2048}" |
26 | 26 | MAX_CPU_PERCENT="${OPENCLAW_KITCHEN_SINK_MAX_CPU_PERCENT:-1200}" |
| 27 | +DOCKER_RUN_TIMEOUT="${OPENCLAW_KITCHEN_SINK_PLUGIN_DOCKER_RUN_TIMEOUT:-1200s}" |
27 | 28 | CONTAINER_NAME="openclaw-kitchen-sink-plugin-e2e-$$" |
28 | 29 | RUN_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-kitchen-sink-plugin.XXXXXX")" |
29 | 30 | STATS_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-kitchen-sink-plugin-stats.XXXXXX")" |
|
57 | 58 | echo "Running kitchen-sink plugin Docker E2E..." |
58 | 59 | docker_e2e_docker_cmd rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true |
59 | 60 | docker_e2e_harness_mount_args |
60 | | -docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" "${DOCKER_ENV_ARGS[@]}" -i "$IMAGE_NAME" bash scripts/e2e/lib/kitchen-sink-plugin/sweep.sh \ |
| 61 | +DOCKER_COMMAND_TIMEOUT="$DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" "${DOCKER_ENV_ARGS[@]}" -i "$IMAGE_NAME" bash scripts/e2e/lib/kitchen-sink-plugin/sweep.sh \ |
61 | 62 | >"$RUN_LOG" 2>&1 & |
62 | 63 | docker_pid="$!" |
63 | 64 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -7,6 +7,7 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-image.sh"
|
7 | 7 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-kitchen-sink-rpc-e2e" OPENCLAW_KITCHEN_SINK_RPC_E2E_IMAGE)" |
8 | 8 | MAX_MEMORY_MIB="${OPENCLAW_KITCHEN_SINK_MAX_MEMORY_MIB:-2048}" |
9 | 9 | MAX_CPU_PERCENT="${OPENCLAW_KITCHEN_SINK_MAX_CPU_PERCENT:-1200}" |
| 10 | +DOCKER_RUN_TIMEOUT="${OPENCLAW_KITCHEN_SINK_RPC_DOCKER_RUN_TIMEOUT:-900s}" |
10 | 11 | CONTAINER_NAME="openclaw-kitchen-sink-rpc-e2e-$$" |
11 | 12 | RUN_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-kitchen-sink-rpc.XXXXXX")" |
12 | 13 | STATS_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-kitchen-sink-rpc-stats.XXXXXX")" |
|
42 | 43 | echo "Running kitchen-sink RPC Docker E2E..." |
43 | 44 | docker_e2e_docker_cmd rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true |
44 | 45 | docker_e2e_harness_mount_args |
45 | | -docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" "${DOCKER_ENV_ARGS[@]}" -i "$IMAGE_NAME" \ |
| 46 | +DOCKER_COMMAND_TIMEOUT="$DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" "${DOCKER_ENV_ARGS[@]}" -i "$IMAGE_NAME" \ |
46 | 47 | node scripts/e2e/kitchen-sink-rpc-walk.mjs >"$RUN_LOG" 2>&1 & |
47 | 48 | docker_pid="$!" |
48 | 49 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -7,6 +7,7 @@ IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-onboard-e2e" OPENCLAW_ONBOARD_E
|
7 | 7 | OPENCLAW_TEST_STATE_FUNCTION_B64="$(docker_e2e_test_state_function_b64)" |
8 | 8 | MAX_MEMORY_MIB="${OPENCLAW_ONBOARD_MAX_MEMORY_MIB:-2048}" |
9 | 9 | MAX_CPU_PERCENT="${OPENCLAW_ONBOARD_MAX_CPU_PERCENT:-1200}" |
| 10 | +DOCKER_RUN_TIMEOUT="${OPENCLAW_ONBOARD_DOCKER_RUN_TIMEOUT:-1200s}" |
10 | 11 | CONTAINER_NAME="openclaw-onboard-e2e-$$" |
11 | 12 | RUN_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-onboard.XXXXXX")" |
12 | 13 | STATS_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-onboard-stats.XXXXXX")" |
@@ -22,7 +23,7 @@ docker_e2e_build_or_reuse "$IMAGE_NAME" onboard
|
22 | 23 | echo "Running onboarding E2E..." |
23 | 24 | docker_e2e_docker_cmd rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true |
24 | 25 | docker_e2e_harness_mount_args |
25 | | -docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" -t \ |
| 26 | +DOCKER_COMMAND_TIMEOUT="$DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" -t \ |
26 | 27 | -e "OPENCLAW_TEST_STATE_FUNCTION_B64=$OPENCLAW_TEST_STATE_FUNCTION_B64" \ |
27 | 28 | "$IMAGE_NAME" bash scripts/e2e/lib/onboard/scenario.sh >"$RUN_LOG" 2>&1 & |
28 | 29 | docker_pid="$!" |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -647,7 +647,10 @@ test -f "$TMPDIR/docker-cmd-seen"
|
647 | 647 | |
648 | 648 | expect(runner, path).toContain('RUN_LOG="$(mktemp'); |
649 | 649 | expect(runner, path).toContain('STATS_LOG="$(mktemp'); |
650 | | -expect(runner, path).toContain('docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME"'); |
| 650 | +expect(runner, path).toContain( |
| 651 | +'DOCKER_COMMAND_TIMEOUT="$DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME"', |
| 652 | +); |
| 653 | +expect(runner, path).toContain('DOCKER_RUN_TIMEOUT="${OPENCLAW_'); |
651 | 654 | expect(runner, path).toContain('docker_e2e_docker_cmd inspect "$CONTAINER_NAME"'); |
652 | 655 | expect(runner, path).toContain("docker_e2e_docker_cmd stats --no-stream"); |
653 | 656 | expect(runner, path).not.toMatch(/(^|\n)docker run --name "\$CONTAINER_NAME"/u); |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
