Clean disposable CI stacks on interruption and job completion

2026-10-31 02:14:35 +08:00
parent 40c1023a86
commit a589f51698
5 changed files with 136 additions and 3 deletions
@@ -2,7 +2,8 @@
 set -Eeuo pipefail
 : "${WATERFALL_WIKI_IMAGE:?Build the runtime image first}"
 : "${WATERFALL_WIKI_TEST_IMAGE:?Build the integration image first}"
-export COMPOSE_PROJECT_NAME="prompt-ci-${GITEA_RUN_ID:-$$}"
+export GITEA_RUN_ID="${GITEA_RUN_ID:-$$}"
+export COMPOSE_PROJECT_NAME="prompt-ci-$GITEA_RUN_ID"
 export PG_PORT=0 S3_PORT=0 WEB_PORT=0 WEB_BIND_ADDRESS=127.0.0.1
 TEST_ENV=$(mktemp)
 chmod 0600 "$TEST_ENV"
@@ -13,8 +14,19 @@ if [[ -n "${STUDIO_REVIEW_IMAGE:-}" ]]; then
 STUDIO_SERVICES+=(prompt-studio)
 fi
 compose(){ docker compose -p "$COMPOSE_PROJECT_NAME" --env-file "$TEST_ENV" "${COMPOSE_FILES[@]}" "$@"; }
-cleanup(){ code=$?; if [ "$code" -ne 0 ]; then compose logs --tail 160 waterfall-wiki waterfall-wiki-worker "${STUDIO_SERVICES[@]}"; fi; compose down -v --remove-orphans; rm -f "$TEST_ENV"; }
+cleanup(){
+ code=$?
+ trap - EXIT INT TERM
+ if [ "$code" -ne 0 ]; then compose logs --tail 160 waterfall-wiki waterfall-wiki-worker "${STUDIO_SERVICES[@]}" || true; fi
+ cleanup_code=0
+ bash scripts/cleanup-integration.sh || cleanup_code=$?
+ rm -f "$TEST_ENV"
+ if [ "$code" -ne 0 ]; then exit "$code"; fi
+ exit "$cleanup_code"
+}
 trap cleanup EXIT
+trap 'exit 130' INT
+trap 'exit 143' TERM
 # Random credentials exist only for this disposable stack; no host Node required.
 docker run --rm --entrypoint node "$WATERFALL_WIKI_IMAGE" -e "const c=require('crypto');const hex=()=>c.randomBytes(24).toString('hex');console.log('POSTGRES_PASSWORD='+hex()+'\nS3_ACCESS_KEY='+hex()+'\nS3_SECRET_KEY='+hex())" > "$TEST_ENV"
 # Explicitly isolate legacy unauthenticated integration coverage; production fails closed.