fix(e2e): clean package docker artifacts on setup failure · openclaw/openclaw@90bcec9
vincentkoc
·
2026-05-26
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -7,6 +7,11 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
7 | 7 | source "$ROOT_DIR/scripts/lib/docker-e2e-image.sh" |
8 | 8 | source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh" |
9 | 9 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-doctor-install-switch-e2e" OPENCLAW_DOCTOR_INSTALL_SWITCH_E2E_IMAGE)" |
| 10 | +cleanup() { |
| 11 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 12 | +} |
| 13 | +trap cleanup EXIT |
| 14 | + |
10 | 15 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz doctor-switch "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
11 | 16 | # Bare lanes mount the package artifact instead of baking app sources into the image. |
12 | 17 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -26,6 +26,10 @@ ARTIFACT_DIR="${OPENCLAW_MULTI_NODE_ARTIFACT_DIR:-$ROOT_DIR/.artifacts/multi-nod
|
26 | 26 | |
27 | 27 | mkdir -p "$ARTIFACT_DIR" |
28 | 28 | chmod -R a+rwX "$ARTIFACT_DIR" || true |
| 29 | +cleanup() { |
| 30 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 31 | +} |
| 32 | +trap cleanup EXIT |
29 | 33 | |
30 | 34 | # Build the bare e2e image and prepare the package tarball. |
31 | 35 | docker_e2e_build_or_reuse "$IMAGE_NAME" multi-node-update "$ROOT_DIR/scripts/e2e/Dockerfile" "$ROOT_DIR" "bare" "${OPENCLAW_SKIP_DOCKER_BUILD:-0}" |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,11 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
8 | 8 | |
9 | 9 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-plugin-lifecycle-matrix-e2e" OPENCLAW_PLUGIN_LIFECYCLE_MATRIX_E2E_IMAGE)" |
10 | 10 | SKIP_BUILD="${OPENCLAW_PLUGIN_LIFECYCLE_MATRIX_E2E_SKIP_BUILD:-0}" |
| 11 | +cleanup() { |
| 12 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 13 | +} |
| 14 | +trap cleanup EXIT |
| 15 | + |
11 | 16 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz plugin-lifecycle-matrix "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
12 | 17 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
13 | 18 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -9,6 +9,11 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
9 | 9 | |
10 | 10 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-plugin-update-e2e" OPENCLAW_PLUGIN_UPDATE_E2E_IMAGE)" |
11 | 11 | SKIP_BUILD="${OPENCLAW_PLUGIN_UPDATE_E2E_SKIP_BUILD:-0}" |
| 12 | +cleanup() { |
| 13 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 14 | +} |
| 15 | +trap cleanup EXIT |
| 16 | + |
12 | 17 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz plugin-update "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
13 | 18 | # Bare lanes mount the package artifact instead of baking app sources into the image. |
14 | 19 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,15 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
8 | 8 | |
9 | 9 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-release-media-memory-e2e" OPENCLAW_RELEASE_MEDIA_MEMORY_E2E_IMAGE)" |
10 | 10 | SKIP_BUILD="${OPENCLAW_RELEASE_MEDIA_MEMORY_E2E_SKIP_BUILD:-0}" |
| 11 | +run_log="" |
| 12 | +cleanup() { |
| 13 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 14 | +if [ -n "${run_log:-}" ]; then |
| 15 | + rm -f "$run_log" |
| 16 | +fi |
| 17 | +} |
| 18 | +trap cleanup EXIT |
| 19 | + |
11 | 20 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz release-media-memory "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
12 | 21 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
13 | 22 | |
@@ -22,9 +31,7 @@ if ! docker_e2e_run_with_harness \
|
22 | 31 | "${DOCKER_E2E_PACKAGE_ARGS[@]}" \ |
23 | 32 | -i "$IMAGE_NAME" bash scripts/e2e/lib/release-media-memory/scenario.sh >"$run_log" 2>&1; then |
24 | 33 | docker_e2e_print_log "$run_log" |
25 | | - rm -f "$run_log" |
26 | 34 | exit 1 |
27 | 35 | fi |
28 | 36 | |
29 | | -rm -f "$run_log" |
30 | 37 | echo "Release media memory Docker E2E passed." |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,15 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
8 | 8 | |
9 | 9 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-release-plugin-marketplace-e2e" OPENCLAW_RELEASE_PLUGIN_MARKETPLACE_E2E_IMAGE)" |
10 | 10 | SKIP_BUILD="${OPENCLAW_RELEASE_PLUGIN_MARKETPLACE_E2E_SKIP_BUILD:-0}" |
| 11 | +run_log="" |
| 12 | +cleanup() { |
| 13 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 14 | +if [ -n "${run_log:-}" ]; then |
| 15 | + rm -f "$run_log" |
| 16 | +fi |
| 17 | +} |
| 18 | +trap cleanup EXIT |
| 19 | + |
11 | 20 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz release-plugin-marketplace "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
12 | 21 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
13 | 22 | |
@@ -22,9 +31,7 @@ if ! docker_e2e_run_with_harness \
|
22 | 31 | "${DOCKER_E2E_PACKAGE_ARGS[@]}" \ |
23 | 32 | -i "$IMAGE_NAME" bash scripts/e2e/lib/release-plugin-marketplace/scenario.sh >"$run_log" 2>&1; then |
24 | 33 | docker_e2e_print_log "$run_log" |
25 | | - rm -f "$run_log" |
26 | 34 | exit 1 |
27 | 35 | fi |
28 | 36 | |
29 | | -rm -f "$run_log" |
30 | 37 | echo "Release plugin marketplace Docker E2E passed." |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,15 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
8 | 8 | |
9 | 9 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-release-typed-onboarding-e2e" OPENCLAW_RELEASE_TYPED_ONBOARDING_E2E_IMAGE)" |
10 | 10 | SKIP_BUILD="${OPENCLAW_RELEASE_TYPED_ONBOARDING_E2E_SKIP_BUILD:-0}" |
| 11 | +run_log="" |
| 12 | +cleanup() { |
| 13 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 14 | +if [ -n "${run_log:-}" ]; then |
| 15 | + rm -f "$run_log" |
| 16 | +fi |
| 17 | +} |
| 18 | +trap cleanup EXIT |
| 19 | + |
11 | 20 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz release-typed-onboarding "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
12 | 21 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
13 | 22 | |
@@ -22,9 +31,7 @@ if ! docker_e2e_run_with_harness \
|
22 | 31 | "${DOCKER_E2E_PACKAGE_ARGS[@]}" \ |
23 | 32 | -i "$IMAGE_NAME" bash scripts/e2e/lib/release-typed-onboarding/scenario.sh >"$run_log" 2>&1; then |
24 | 33 | docker_e2e_print_log "$run_log" |
25 | | - rm -f "$run_log" |
26 | 34 | exit 1 |
27 | 35 | fi |
28 | 36 | |
29 | | -rm -f "$run_log" |
30 | 37 | echo "Release typed onboarding Docker E2E passed." |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,15 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
8 | 8 | |
9 | 9 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-release-upgrade-user-journey-e2e" OPENCLAW_RELEASE_UPGRADE_USER_JOURNEY_E2E_IMAGE)" |
10 | 10 | SKIP_BUILD="${OPENCLAW_RELEASE_UPGRADE_USER_JOURNEY_E2E_SKIP_BUILD:-0}" |
| 11 | +run_log="" |
| 12 | +cleanup() { |
| 13 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 14 | +if [ -n "${run_log:-}" ]; then |
| 15 | + rm -f "$run_log" |
| 16 | +fi |
| 17 | +} |
| 18 | +trap cleanup EXIT |
| 19 | + |
11 | 20 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz release-upgrade-user-journey "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
12 | 21 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
13 | 22 | |
@@ -23,9 +32,7 @@ if ! docker_e2e_run_with_harness \
|
23 | 32 | "${DOCKER_E2E_PACKAGE_ARGS[@]}" \ |
24 | 33 | -i "$IMAGE_NAME" bash scripts/e2e/lib/release-upgrade-user-journey/scenario.sh >"$run_log" 2>&1; then |
25 | 34 | docker_e2e_print_log "$run_log" |
26 | | - rm -f "$run_log" |
27 | 35 | exit 1 |
28 | 36 | fi |
29 | 37 | |
30 | | -rm -f "$run_log" |
31 | 38 | echo "Release upgrade user journey Docker E2E passed." |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -9,6 +9,15 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh"
|
9 | 9 | |
10 | 10 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-release-user-journey-e2e" OPENCLAW_RELEASE_USER_JOURNEY_E2E_IMAGE)" |
11 | 11 | SKIP_BUILD="${OPENCLAW_RELEASE_USER_JOURNEY_E2E_SKIP_BUILD:-0}" |
| 12 | +run_log="" |
| 13 | +cleanup() { |
| 14 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 15 | +if [ -n "${run_log:-}" ]; then |
| 16 | + rm -f "$run_log" |
| 17 | +fi |
| 18 | +} |
| 19 | +trap cleanup EXIT |
| 20 | + |
12 | 21 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz release-user-journey "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
13 | 22 | docker_e2e_package_mount_args "$PACKAGE_TGZ" |
14 | 23 | |
@@ -23,9 +32,7 @@ if ! docker_e2e_run_with_harness \
|
23 | 32 | "${DOCKER_E2E_PACKAGE_ARGS[@]}" \ |
24 | 33 | -i "$IMAGE_NAME" bash scripts/e2e/lib/release-user-journey/scenario.sh >"$run_log" 2>&1; then |
25 | 34 | docker_e2e_print_log "$run_log" |
26 | | - rm -f "$run_log" |
27 | 35 | exit 1 |
28 | 36 | fi |
29 | 37 | |
30 | | -rm -f "$run_log" |
31 | 38 | echo "Release user journey Docker E2E passed." |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,6 +8,11 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-image.sh"
|
8 | 8 | source "$ROOT_DIR/scripts/lib/docker-e2e-package.sh" |
9 | 9 | |
10 | 10 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-skill-install-e2e" OPENCLAW_SKILL_INSTALL_E2E_IMAGE)" |
| 11 | +cleanup() { |
| 12 | + docker_e2e_cleanup_package_tgz "${PACKAGE_TGZ:-}" |
| 13 | +} |
| 14 | +trap cleanup EXIT |
| 15 | + |
11 | 16 | PACKAGE_TGZ="$(docker_e2e_prepare_package_tgz skill-install "${OPENCLAW_CURRENT_PACKAGE_TGZ:-}")" |
12 | 17 | OPENCLAW_TEST_STATE_SCRIPT_B64="$(docker_e2e_test_state_shell_b64 skill-install empty)" |
13 | 18 | |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
