fix(e2e): time out live image pulls · openclaw/openclaw@f...
vincentkoc
·
2026-05-26
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -5,6 +5,8 @@ SCRIPT_ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
5 | 5 | ROOT_DIR="${OPENCLAW_LIVE_DOCKER_REPO_ROOT:-$SCRIPT_ROOT_DIR}" |
6 | 6 | ROOT_DIR="$(cd "$ROOT_DIR" && pwd)" |
7 | 7 | source "$SCRIPT_ROOT_DIR/scripts/lib/docker-build.sh" |
| 8 | +source "$SCRIPT_ROOT_DIR/scripts/lib/docker-e2e-container.sh" |
| 9 | +DOCKER_COMMAND_TIMEOUT="${DOCKER_COMMAND_TIMEOUT:-${OPENCLAW_LIVE_DOCKER_PULL_TIMEOUT:-600s}}" |
8 | 10 | IMAGE_NAME="${OPENCLAW_IMAGE:-openclaw:local}" |
9 | 11 | LIVE_IMAGE_NAME="${OPENCLAW_LIVE_IMAGE:-${IMAGE_NAME}-live}" |
10 | 12 | DOCKER_BUILD_EXTENSIONS="${OPENCLAW_DOCKER_BUILD_EXTENSIONS:-${OPENCLAW_EXTENSIONS:-}}" |
@@ -24,11 +26,11 @@ fi
|
24 | 26 | |
25 | 27 | if [[ "${OPENCLAW_SKIP_DOCKER_BUILD:-}" == "1" ]]; then |
26 | 28 | echo "==> Reuse live-test image: $LIVE_IMAGE_NAME" |
27 | | -if docker image inspect "$LIVE_IMAGE_NAME" >/dev/null 2>&1; then |
| 29 | +if docker_e2e_docker_cmd image inspect "$LIVE_IMAGE_NAME" >/dev/null 2>&1; then |
28 | 30 | exit 0 |
29 | 31 | fi |
30 | 32 | echo "==> Live-test image not found locally; pulling: $LIVE_IMAGE_NAME" |
31 | | -if docker pull "$LIVE_IMAGE_NAME"; then |
| 33 | +if docker_e2e_docker_cmd pull "$LIVE_IMAGE_NAME"; then |
32 | 34 | exit 0 |
33 | 35 | fi |
34 | 36 | if ! docker_build_on_missing_enabled; then |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -146,8 +146,14 @@ describe("docker build helper", () => {
|
146 | 146 | expect(e2eImageHelper).toContain("Docker image not available; building"); |
147 | 147 | expect(e2eImageHelper).toContain('docker_e2e_docker_cmd image inspect "$image_name"'); |
148 | 148 | expect(e2eImageHelper).toContain('docker_e2e_docker_cmd pull "$image_name"'); |
149 | | -expect(liveBuild).toContain("docker image inspect"); |
150 | | -expect(liveBuild).toContain("docker pull"); |
| 149 | +expect(liveBuild).toContain('source "$SCRIPT_ROOT_DIR/scripts/lib/docker-e2e-container.sh"'); |
| 150 | +expect(liveBuild).toContain( |
| 151 | +'DOCKER_COMMAND_TIMEOUT="${DOCKER_COMMAND_TIMEOUT:-${OPENCLAW_LIVE_DOCKER_PULL_TIMEOUT:-600s}}"', |
| 152 | +); |
| 153 | +expect(liveBuild).toContain('docker_e2e_docker_cmd image inspect "$LIVE_IMAGE_NAME"'); |
| 154 | +expect(liveBuild).toContain('docker_e2e_docker_cmd pull "$LIVE_IMAGE_NAME"'); |
| 155 | +expect(liveBuild).not.toContain('docker image inspect "$LIVE_IMAGE_NAME"'); |
| 156 | +expect(liveBuild).not.toContain('docker pull "$LIVE_IMAGE_NAME"'); |
151 | 157 | expect(liveBuild).toContain("Live-test image not available; building"); |
152 | 158 | expect(liveCliBackend).toContain( |
153 | 159 | 'OPENCLAW_LIVE_DOCKER_REPO_ROOT="$ROOT_DIR" "$TRUSTED_HARNESS_DIR/scripts/test-live-build-docker.sh"', |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -688,6 +688,12 @@ describe("package artifact reuse", () => {
|
688 | 688 | ); |
689 | 689 | expect(build).toContain('ROOT_DIR="${OPENCLAW_LIVE_DOCKER_REPO_ROOT:-$SCRIPT_ROOT_DIR}"'); |
690 | 690 | expect(build).toContain('source "$SCRIPT_ROOT_DIR/scripts/lib/docker-build.sh"'); |
| 691 | +expect(build).toContain('source "$SCRIPT_ROOT_DIR/scripts/lib/docker-e2e-container.sh"'); |
| 692 | +expect(build).toContain( |
| 693 | +'DOCKER_COMMAND_TIMEOUT="${DOCKER_COMMAND_TIMEOUT:-${OPENCLAW_LIVE_DOCKER_PULL_TIMEOUT:-600s}}"', |
| 694 | +); |
| 695 | +expect(build).toContain('docker_e2e_docker_cmd pull "$LIVE_IMAGE_NAME"'); |
| 696 | +expect(build).not.toContain('docker pull "$LIVE_IMAGE_NAME"'); |
691 | 697 | expect(stage).toContain( |
692 | 698 | 'local scripts_dir="${OPENCLAW_LIVE_DOCKER_SCRIPTS_DIR:-/src/scripts}"', |
693 | 699 | ); |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
