fix(e2e): add agent image loading to enterprise-clean e2e orchestrator
- 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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user