fix(e2e): forward onboard gateway wait knobs · openclaw/openclaw@2ef0589
vincentkoc
·
2026-06-19
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -2,13 +2,16 @@
|
2 | 2 | set -euo pipefail |
3 | 3 | |
4 | 4 | ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" |
| 5 | +source "$ROOT_DIR/scripts/lib/openclaw-e2e-instance.sh" |
5 | 6 | source "$ROOT_DIR/scripts/lib/docker-e2e-image.sh" |
6 | 7 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-onboard-e2e" OPENCLAW_ONBOARD_E2E_IMAGE)" |
7 | 8 | OPENCLAW_TEST_STATE_FUNCTION_B64="$(docker_e2e_test_state_function_b64)" |
8 | 9 | MAX_MEMORY_MIB="$(docker_e2e_read_nonnegative_decimal_env OPENCLAW_ONBOARD_MAX_MEMORY_MIB 2048)" |
9 | 10 | MAX_CPU_PERCENT="$(docker_e2e_read_nonnegative_decimal_env OPENCLAW_ONBOARD_MAX_CPU_PERCENT 1200)" |
10 | 11 | DOCKER_RUN_TIMEOUT="${OPENCLAW_ONBOARD_DOCKER_RUN_TIMEOUT:-1200s}" |
11 | 12 | COMMAND_TIMEOUT="${OPENCLAW_ONBOARD_COMMAND_TIMEOUT:-${OPENCLAW_E2E_COMMAND_TIMEOUT:-300s}}" |
| 13 | +GATEWAY_WAIT_ATTEMPTS="$(openclaw_e2e_read_positive_int_env OPENCLAW_ONBOARD_GATEWAY_WAIT_ATTEMPTS 20)" |
| 14 | +GATEWAY_WAIT_INTERVAL_S="$(docker_e2e_read_nonnegative_decimal_env OPENCLAW_ONBOARD_GATEWAY_WAIT_INTERVAL_S 1)" |
12 | 15 | CONTAINER_NAME="openclaw-onboard-e2e-$$" |
13 | 16 | RUN_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-onboard.XXXXXX")" |
14 | 17 | STATS_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-onboard-stats.XXXXXX")" |
@@ -27,6 +30,8 @@ docker_e2e_harness_mount_args
|
27 | 30 | DOCKER_COMMAND_TIMEOUT="$DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run --name "$CONTAINER_NAME" "${DOCKER_E2E_HARNESS_ARGS[@]}" -t \ |
28 | 31 | -e "OPENCLAW_TEST_STATE_FUNCTION_B64=$OPENCLAW_TEST_STATE_FUNCTION_B64" \ |
29 | 32 | -e "OPENCLAW_E2E_COMMAND_TIMEOUT=$COMMAND_TIMEOUT" \ |
| 33 | + -e "OPENCLAW_ONBOARD_GATEWAY_WAIT_ATTEMPTS=$GATEWAY_WAIT_ATTEMPTS" \ |
| 34 | + -e "OPENCLAW_ONBOARD_GATEWAY_WAIT_INTERVAL_S=$GATEWAY_WAIT_INTERVAL_S" \ |
30 | 35 | "$IMAGE_NAME" bash scripts/e2e/lib/onboard/scenario.sh >"$RUN_LOG" 2>&1 & |
31 | 36 | docker_pid="$!" |
32 | 37 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -3220,7 +3220,17 @@ output="$(cat "$sampler_log")"
|
3220 | 3220 | expect(runner).toContain( |
3221 | 3221 | 'COMMAND_TIMEOUT="${OPENCLAW_ONBOARD_COMMAND_TIMEOUT:-${OPENCLAW_E2E_COMMAND_TIMEOUT:-300s}}"', |
3222 | 3222 | ); |
| 3223 | +expect(runner).toContain( |
| 3224 | +'GATEWAY_WAIT_ATTEMPTS="$(openclaw_e2e_read_positive_int_env OPENCLAW_ONBOARD_GATEWAY_WAIT_ATTEMPTS 20)"', |
| 3225 | +); |
| 3226 | +expect(runner).toContain( |
| 3227 | +'GATEWAY_WAIT_INTERVAL_S="$(docker_e2e_read_nonnegative_decimal_env OPENCLAW_ONBOARD_GATEWAY_WAIT_INTERVAL_S 1)"', |
| 3228 | +); |
3223 | 3229 | expect(runner).toContain('-e "OPENCLAW_E2E_COMMAND_TIMEOUT=$COMMAND_TIMEOUT"'); |
| 3230 | +expect(runner).toContain('-e "OPENCLAW_ONBOARD_GATEWAY_WAIT_ATTEMPTS=$GATEWAY_WAIT_ATTEMPTS"'); |
| 3231 | +expect(runner).toContain( |
| 3232 | +'-e "OPENCLAW_ONBOARD_GATEWAY_WAIT_INTERVAL_S=$GATEWAY_WAIT_INTERVAL_S"', |
| 3233 | +); |
3224 | 3234 | expect(runner).toContain('--name "$CONTAINER_NAME"'); |
3225 | 3235 | expect(runner).toContain("docker_e2e_sample_stats_until_exit \\"); |
3226 | 3236 | expect(runner).toContain('"$STATS_LOG" \\'); |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
