



























@@ -7,6 +7,11 @@ source "$ROOT_DIR/scripts/docker/install-sh-common/version-parse.sh"
77source "$ROOT_DIR/scripts/lib/docker-build.sh"
88source "$ROOT_DIR/scripts/lib/docker-e2e-container.sh"
99DOCKER_COMMAND_TIMEOUT="${DOCKER_COMMAND_TIMEOUT:-${OPENCLAW_INSTALL_SMOKE_DOCKER_COMMAND_TIMEOUT:-600s}}"
10+INSTALL_SMOKE_DOCKER_RUN_TIMEOUT="${OPENCLAW_INSTALL_SMOKE_DOCKER_RUN_TIMEOUT:-2700s}"
11+12+run_install_smoke_container() {
13+ DOCKER_COMMAND_TIMEOUT="$INSTALL_SMOKE_DOCKER_RUN_TIMEOUT" docker_e2e_docker_run_cmd run "$@"
14+}
10151116resolve_default_smoke_platform() {
1217local host_os
@@ -417,7 +422,7 @@ else
417422 start_update_server
418423419424echo "==> Run installer smoke test (root): $FRESH_TAG_URL"
420-docker run --rm -t \
425+run_install_smoke_container --rm -t \
421426 --platform "$SMOKE_PLATFORM" \
422427${UPDATE_DOCKER_HOST_ARGS[@]+"${UPDATE_DOCKER_HOST_ARGS[@]}"} \
423428"${NPM_CACHE_DOCKER_ARGS[@]}" \
@@ -441,7 +446,7 @@ else
441446fi
442447443448echo "==> Run update smoke (${UPDATE_BASELINE_VERSION} -> ${UPDATE_EXPECT_VERSION})"
444-docker run --rm -t \
449+run_install_smoke_container --rm -t \
445450 --platform "$SMOKE_PLATFORM" \
446451${UPDATE_DOCKER_HOST_ARGS[@]+"${UPDATE_DOCKER_HOST_ARGS[@]}"} \
447452"${NPM_CACHE_DOCKER_ARGS[@]}" \
@@ -461,7 +466,7 @@ else
461466echo "==> Skip direct npm global smoke (OPENCLAW_INSTALL_SMOKE_SKIP_NPM_GLOBAL=1)"
462467else
463468echo "==> Run direct npm global smoke (${UPDATE_BASELINE_VERSION} -> ${UPDATE_EXPECT_VERSION})"
464-docker run --rm -t \
469+run_install_smoke_container --rm -t \
465470 --platform "$SMOKE_PLATFORM" \
466471${UPDATE_DOCKER_HOST_ARGS[@]+"${UPDATE_DOCKER_HOST_ARGS[@]}"} \
467472"${NPM_CACHE_DOCKER_ARGS[@]}" \
@@ -484,7 +489,7 @@ if [[ "$SKIP_FRESHNESS" == "1" ]]; then
484489else
485490 prepare_npm_cache
486491echo "==> Run installer npm freshness smoke"
487-docker run --rm -t \
492+run_install_smoke_container --rm -t \
488493 --platform "$SMOKE_PLATFORM" \
489494"${NPM_CACHE_DOCKER_ARGS[@]}" \
490495"${INSTALL_SCRIPT_DOCKER_ARGS[@]}" \
@@ -518,7 +523,7 @@ else
518523fi
519524520525echo "==> Run installer non-root test: $INSTALL_URL"
521-docker run --rm -t \
526+run_install_smoke_container --rm -t \
522527 --platform "$NONROOT_PLATFORM" \
523528"${INSTALL_SCRIPT_DOCKER_ARGS[@]}" \
524529 -e OPENCLAW_INSTALL_URL="$INSTALL_URL" \
@@ -542,7 +547,7 @@ if [[ "$SKIP_NONROOT" == "1" ]]; then
542547fi
543548544549echo "==> Run CLI installer non-root test (same image)"
545-docker run --rm -t \
550+run_install_smoke_container --rm -t \
546551 --platform "$NONROOT_PLATFORM" \
547552 --entrypoint /bin/bash \
548553"${INSTALL_SCRIPT_DOCKER_ARGS[@]}" \
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。