Merge pull request 'fix(ci): resolve Staging API Integration Tests 0s failure - container name conflict' (#1278) from fix/staging-tests-container-cleanup into develop

2026-08-07 20:08:39 +08:00
parent 316f01b3f0 88c71268c9
commit 8b6800b63f
1 changed files with 2 additions and 2 deletions
@@ -1102,7 +1102,6 @@ jobs:
          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
          sh -lc "npm ci --registry=https://registry.npmmirror.com && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts"
        docker cp apps "$CONTAINER_NAME:/workspace/"
-        docker cp package-lock.json "$CONTAINER_NAME:/workspace/" 2>/dev/null || true
        docker start -a "$CONTAINER_NAME"
        EXIT_CODE=$(docker wait "$CONTAINER_NAME")
        docker rm "$CONTAINER_NAME" 2>/dev/null || true
@@ -1157,6 +1156,8 @@ jobs:
        # DooD模式下不能用-v挂载（宿主机路径与CI容器路径不一致）
        # 改用 docker create + docker cp 方式把代码拷进容器
        CONTAINER_NAME="staging-api-tests-$$"
+        # 强制清理可能残留的同名容器（上一次异常退出时未清理）
+        docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
        docker create --name "$CONTAINER_NAME" \
          -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
          -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
@@ -1164,7 +1165,6 @@ jobs:
          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
          sh -lc 'npm ci --registry=https://registry.npmmirror.com && npx playwright test --reporter=line e2e/test_auth.spec.ts e2e/test_asset.spec.ts e2e/test_project.spec.ts'
        docker cp apps "$CONTAINER_NAME:/workspace/"
-        docker cp package-lock.json "$CONTAINER_NAME:/workspace/" 2>/dev/null || true
        docker start -a "$CONTAINER_NAME"
        EXIT_CODE=$(docker wait "$CONTAINER_NAME")
        docker rm "$CONTAINER_NAME" 2>/dev/null || true