From a74ce6f20cd35c06aec54a63b72bfc0dccf9030f Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Fri, 19 Jun 2026 03:46:14 +0200 Subject: [PATCH] fix(e2e): forward plugin sweep runtime knobs --- scripts/e2e/plugins-docker.sh | 5 ++++- test/scripts/docker-build-helper.test.ts | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/e2e/plugins-docker.sh b/scripts/e2e/plugins-docker.sh index d95c1fc7821b..e0542663691c 100755 --- a/scripts/e2e/plugins-docker.sh +++ b/scripts/e2e/plugins-docker.sh @@ -13,6 +13,7 @@ CLAW_HUB_PREFLIGHT_BODY_MAX_BYTES="$( CLAW_HUB_PREFLIGHT_TIMEOUT_MS="$( docker_e2e_read_positive_int_env OPENCLAW_PLUGINS_E2E_CLAWHUB_PREFLIGHT_TIMEOUT_MS 30000 )" +PLUGINS_CLI_TIMEOUT="${OPENCLAW_PLUGINS_CLI_TIMEOUT:-180s}" docker_e2e_build_or_reuse "$IMAGE_NAME" plugins @@ -22,6 +23,7 @@ DOCKER_ENV_ARGS=( -e "OPENCLAW_DOCKER_E2E_LOG_PRINT_BYTES=$OPENCLAW_DOCKER_E2E_LOG_PRINT_BYTES" -e "OPENCLAW_PLUGINS_E2E_CLAWHUB_PREFLIGHT_BODY_MAX_BYTES=$CLAW_HUB_PREFLIGHT_BODY_MAX_BYTES" -e "OPENCLAW_PLUGINS_E2E_CLAWHUB_PREFLIGHT_TIMEOUT_MS=$CLAW_HUB_PREFLIGHT_TIMEOUT_MS" + -e "OPENCLAW_PLUGINS_CLI_TIMEOUT=$PLUGINS_CLI_TIMEOUT" -e "OPENCLAW_TEST_STATE_SCRIPT_B64=$OPENCLAW_TEST_STATE_SCRIPT_B64" ) for env_name in \ @@ -40,7 +42,8 @@ if [[ "${OPENCLAW_PLUGINS_E2E_LIVE_CLAWHUB:-0}" = "1" ]]; then CLAWHUB_URL \ OPENCLAW_CLAWHUB_TOKEN \ CLAWHUB_TOKEN \ - CLAWHUB_AUTH_TOKEN; do + CLAWHUB_AUTH_TOKEN \ + OPENCLAW_PLUGINS_E2E_LIVE_NPM_REGISTRY; do env_value="${!env_name:-}" if [[ -n "$env_value" && "$env_value" != "undefined" && "$env_value" != "null" ]]; then DOCKER_ENV_ARGS+=(-e "$env_name") diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts index 874bb85bf334..0b0fea7656e9 100644 --- a/test/scripts/docker-build-helper.test.ts +++ b/test/scripts/docker-build-helper.test.ts @@ -4145,6 +4145,7 @@ output="$(cat "$sampler_log")" expect(clawhub).toContain('OPENCLAW_CLAWHUB_URL="http://127.0.0.1:'); expect(clawhub).toContain("OPENCLAW_PLUGINS_E2E_LIVE_CLAWHUB"); expect(clawhub).toContain("OPENCLAW_PLUGINS_E2E_LIVE_NPM_REGISTRY"); + expect(runner).toContain("OPENCLAW_PLUGINS_E2E_LIVE_NPM_REGISTRY"); expect(clawhub).toContain("live ClawHub can rate-limit CI"); expect(clawhub).toContain('[[ -n "${OPENCLAW_CLAWHUB_URL:-}" || -n "${CLAWHUB_URL:-}" ]]'); expect(clawhub).toContain("Ignoring ambient ClawHub URL for fixture-mode plugin E2E"); @@ -4187,6 +4188,7 @@ output="$(cat "$sampler_log")" }); it("covers plugin CLI sources in the Docker plugin sweep", () => { + const runner = readFileSync(PLUGINS_DOCKER_E2E_PATH, "utf8"); const sweep = readFileSync(PLUGINS_DOCKER_SWEEP_PATH, "utf8"); const marketplace = readFileSync(PLUGINS_DOCKER_MARKETPLACE_PATH, "utf8"); const clawhub = readFileSync(PLUGINS_DOCKER_CLAWHUB_PATH, "utf8"); @@ -4194,6 +4196,8 @@ output="$(cat "$sampler_log")" const npmRegistry = readFileSync(PLUGINS_DOCKER_NPM_REGISTRY_PATH, "utf8"); expect(sweep).toContain('OPENCLAW_PLUGINS_CLI_TIMEOUT="${OPENCLAW_PLUGINS_CLI_TIMEOUT:-180s}"'); + expect(runner).toContain('PLUGINS_CLI_TIMEOUT="${OPENCLAW_PLUGINS_CLI_TIMEOUT:-180s}"'); + expect(runner).toContain('-e "OPENCLAW_PLUGINS_CLI_TIMEOUT=$PLUGINS_CLI_TIMEOUT"'); expect(sweep).toContain( 'run_logged "$label" openclaw_e2e_maybe_timeout "$OPENCLAW_PLUGINS_CLI_TIMEOUT" node "$OPENCLAW_ENTRY" "$@"', );