ci: 修正 staging 默认部署目标为 116.62.226.203:22(staging业务机) #2065

Merged
auto-approve-bot merged 2 commits from fix/ci-staging-116-port22-v2 into develop 2026-09-27 17:42:18 +08:00
Owner

背景

PR #2064 把 CI 默认 STAGING_SSH_HOST/PORT 改成了 47.98.113.167:22222,但经运维再次确认搞反了:

  • 116.62.226.203:22 才是 staging 业务机(nginx 80/443 对外,staging.xiaoxiajianji.com DNS 指向这台)
  • 47.98.113.167:22222 是 production 机(对外端口 8001/3002/5433/6380,sshd 走 22222 绕过云盾)

之前 push pipeline #55954 把 SSH 打到 116 并因"找不到 xiaoxia-postgres-staging"失败,是因为 116 上的 staging 基础容器(postgres/redis)还没起来,不是连错机器。

变更

  • .gitea/workflows/ci-pipeline.yml 默认值改回 116.62.226.203:22,注释同步修正
  • scripts/ci_staging_healthcheck.sh 默认值与注释同步
  • Production 默认 47.98.113.167:22222 保持不变(正确)

配套运维准备(已完成)

  1. 116 上已启动 xiaoxia-postgres-staging(postgres:16, 127.0.0.1:5434→5432)和 xiaoxia-redis-staging(redis:7, 127.0.0.1:6381→6379),均 healthy
  2. 116 的 /root/.ssh/authorized_keys 已补上 staging_deploy_key 公钥(之前缺失导致 CI job 容器内公网 SSH 被拒)
  3. 容器内实测:ssh root@116.62.226.203 -p 22 -i staging_deploy_key 成功,hostname 返回 iZbp15fchyez91r4b3ok74Z,docker 命令可正常执行。无需 --network host 或 host.docker.internal 绕过。
## 背景 PR #2064 把 CI 默认 STAGING_SSH_HOST/PORT 改成了 `47.98.113.167:22222`,但经运维再次确认搞反了: - **116.62.226.203:22** 才是 **staging** 业务机(nginx 80/443 对外,staging.xiaoxiajianji.com DNS 指向这台) - **47.98.113.167:22222** 是 **production** 机(对外端口 8001/3002/5433/6380,sshd 走 22222 绕过云盾) 之前 push pipeline #55954 把 SSH 打到 116 并因"找不到 xiaoxia-postgres-staging"失败,是因为 116 上的 staging 基础容器(postgres/redis)还没起来,不是连错机器。 ## 变更 - `.gitea/workflows/ci-pipeline.yml` 默认值改回 `116.62.226.203:22`,注释同步修正 - `scripts/ci_staging_healthcheck.sh` 默认值与注释同步 - Production 默认 `47.98.113.167:22222` 保持不变(正确) ## 配套运维准备(已完成) 1. 116 上已启动 `xiaoxia-postgres-staging`(postgres:16, 127.0.0.1:5434→5432)和 `xiaoxia-redis-staging`(redis:7, 127.0.0.1:6381→6379),均 healthy 2. 116 的 `/root/.ssh/authorized_keys` 已补上 `staging_deploy_key` 公钥(之前缺失导致 CI job 容器内公网 SSH 被拒) 3. 容器内实测:`ssh root@116.62.226.203 -p 22 -i staging_deploy_key` 成功,hostname 返回 `iZbp15fchyez91r4b3ok74Z`,docker 命令可正常执行。无需 `--network host` 或 `host.docker.internal` 绕过。
xiaoxia added 2 commits 2026-09-27 17:32:28 +08:00
ci(healthcheck): fix staging SSH defaults to 116.62.226.203:22
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 38s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m56s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 2m11s
CI/CD Pipeline / Validate - Style (pull_request) Successful in 2m55s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m2s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 5m32s
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 6m1s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 6m26s
AI Code Review / AI Code Review (pull_request) Successful in 6m33s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 9m4s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / CI Gate (pull_request) Successful in 1s
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 6m48s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 35s
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 33s
952a648812

🚀 预览环境已部署

项目 详情
PR号 #2065
预览链接 https://pr-2065.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据,请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后,预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #2065 | | 预览链接 | [https://pr-2065.preview.xiaoxiajianji.com](https://pr-2065.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据,请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后,预览环境会自动清理。
auto-approve-bot merged commit 2d3cb13707 into develop 2026-09-27 17:42:18 +08:00
auto-approve-bot deleted branch fix/ci-staging-116-port22-v2 2026-09-27 17:42:21 +08:00

🗑️ 预览环境已清理

PR #2065 已关闭或合并,对应的预览环境已被清理。

如有需要,可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #2065 已关闭或合并,对应的预览环境已被清理。 > 如有需要,可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.