diff --git a/scripts/e2e/lib/doctor-install-switch/scenario.sh b/scripts/e2e/lib/doctor-install-switch/scenario.sh index 3fc3a3ec684c..9f87a2578218 100644 --- a/scripts/e2e/lib/doctor-install-switch/scenario.sh +++ b/scripts/e2e/lib/doctor-install-switch/scenario.sh @@ -25,7 +25,11 @@ tar -xzf "$package_tgz" -C "$git_root" --strip-components=1 node scripts/e2e/lib/package-git-fixture.mjs prepare "$git_root" ( cd "$git_root" - openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=optional --no-fund --no-audit >/tmp/openclaw-git-install.log 2>&1 + # Git-style fixtures still need optional native prebuilds; omit only development dependencies. + if ! openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=dev --no-fund --no-audit >/tmp/openclaw-git-install.log 2>&1; then + openclaw_e2e_print_log /tmp/openclaw-git-install.log >&2 + exit 1 + fi git init -q git config user.email "docker-e2e@openclaw.local" git config user.name "OpenClaw Docker E2E" diff --git a/scripts/e2e/update-channel-switch-docker.sh b/scripts/e2e/update-channel-switch-docker.sh index 7cf2cc909515..68106798254c 100755 --- a/scripts/e2e/update-channel-switch-docker.sh +++ b/scripts/e2e/update-channel-switch-docker.sh @@ -61,7 +61,8 @@ node scripts/e2e/lib/package-git-fixture.mjs prepare "$git_root" node scripts/e2e/lib/update-channel-switch/assertions.mjs prepare-git-fixture "$git_root" ( cd "$git_root" - if ! openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=optional --no-fund --no-audit >/tmp/openclaw-git-install.log 2>&1; then + # Git-style fixtures still need optional native prebuilds; omit only development dependencies. + if ! openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=dev --no-fund --no-audit >/tmp/openclaw-git-install.log 2>&1; then openclaw_e2e_print_log /tmp/openclaw-git-install.log >&2 exit 1 fi diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts index 0de574b0512a..8dc7d3973a48 100644 --- a/test/scripts/docker-build-helper.test.ts +++ b/test/scripts/docker-build-helper.test.ts @@ -2436,7 +2436,7 @@ docker_e2e_docker_run_cmd run demo 'openclaw_e2e_install_package "$ARTIFACTS/install-a.log" "OpenClaw package under node-A prefix" "$NPM_PREFIX_A"', ); expectTextToIncludeAll(updateChannel, [ - 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=optional --no-fund --no-audit', + 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=dev --no-fund --no-audit', 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install -g --prefix /tmp/npm-prefix --omit=optional "$pkg_tgz_path"', "openclaw_e2e_print_log /tmp/openclaw-git-install.log", 'openclaw_e2e_print_log "$package_install_log"', @@ -2444,12 +2444,11 @@ docker_e2e_docker_run_cmd run demo expect(updateChannel).not.toContain("cat /tmp/openclaw-git-install.log"); expect(updateChannel).not.toContain('cat "$package_install_log"'); - expect(doctorSwitch).toContain( - 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=optional --no-fund --no-audit', - ); - expect(doctorSwitch).toContain( + expectTextToIncludeAll(doctorSwitch, [ + 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install --omit=dev --no-fund --no-audit', 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install -g --prefix /tmp/npm-prefix --omit=optional "$package_tgz"', - ); + "openclaw_e2e_print_log /tmp/openclaw-git-install.log", + ]); for (const script of [releaseUpgrade, upgradeSurvivor, pluginCorrupt]) { expect(script).toContain( 'openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install -g',