From b3d889b3c71dee683a6550f520c4ac8219fe98db Mon Sep 17 00:00:00 2001 From: busya Date: Thu, 11 Jun 2026 16:24:17 +0300 Subject: [PATCH] fix(e2e): add agent image loading to enterprise-clean e2e orchestrator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add agent archive check (ss-tools-agent.{tag}.tar.xz) with docker build fallback, matching the updated bundle_release() - Fix pre-existing archive filename mismatch: backend.{tag}.tar.xz → ss-tools-backend.{tag}.tar.xz (same for frontend) — archive detection was always failing because build.sh uses the ss-tools- prefix --- frontend/e2e/run-enterprise-clean-e2e.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/e2e/run-enterprise-clean-e2e.sh b/frontend/e2e/run-enterprise-clean-e2e.sh index 1b1a3514..eca6bc2e 100755 --- a/frontend/e2e/run-enterprise-clean-e2e.sh +++ b/frontend/e2e/run-enterprise-clean-e2e.sh @@ -216,8 +216,8 @@ stage1_enterprise_clean() { # ── 1.2. LOAD IMAGES ───────────────────────────────────── log_info "Step 1.2: Loading Docker images from bundle..." - if [[ -f "${PROJECT_ROOT}/dist/docker/backend.${RELEASE_TAG}.tar.xz" ]]; then - xz -dc "${PROJECT_ROOT}/dist/docker/backend.${RELEASE_TAG}.tar.xz" | docker load + if [[ -f "${PROJECT_ROOT}/dist/docker/ss-tools-backend.${RELEASE_TAG}.tar.xz" ]]; then + xz -dc "${PROJECT_ROOT}/dist/docker/ss-tools-backend.${RELEASE_TAG}.tar.xz" | docker load log_ok "Backend image loaded" else log_warn "Backend archive not found, attempting docker build instead..." @@ -225,8 +225,8 @@ stage1_enterprise_clean() { docker build -f docker/backend.Dockerfile -t "ss-tools-backend:${RELEASE_TAG}" . fi - if [[ -f "${PROJECT_ROOT}/dist/docker/frontend.${RELEASE_TAG}.tar.xz" ]]; then - xz -dc "${PROJECT_ROOT}/dist/docker/frontend.${RELEASE_TAG}.tar.xz" | docker load + if [[ -f "${PROJECT_ROOT}/dist/docker/ss-tools-frontend.${RELEASE_TAG}.tar.xz" ]]; then + xz -dc "${PROJECT_ROOT}/dist/docker/ss-tools-frontend.${RELEASE_TAG}.tar.xz" | docker load log_ok "Frontend image loaded" else log_warn "Frontend archive not found, attempting docker build instead..." @@ -234,6 +234,15 @@ stage1_enterprise_clean() { docker build -f docker/frontend.Dockerfile -t "ss-tools-frontend:${RELEASE_TAG}" . fi + if [[ -f "${PROJECT_ROOT}/dist/docker/ss-tools-agent.${RELEASE_TAG}.tar.xz" ]]; then + xz -dc "${PROJECT_ROOT}/dist/docker/ss-tools-agent.${RELEASE_TAG}.tar.xz" | docker load + log_ok "Agent image loaded" + else + log_warn "Agent archive not found, attempting docker build instead..." + cd "$PROJECT_ROOT" + docker build -f docker/Dockerfile.agent -t "ss-tools-agent:${RELEASE_TAG}" . + fi + # ── 1.3. START POSTGRESQL (on default bridge first) ───── log_info "Step 1.3: Starting new PostgreSQL container..." docker rm -f ss-tools-e2e-pg 2>/dev/null || true