diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..c29d245 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,85 @@ +# ============================================================================ +# .drone.yml — MixingX 交付晋级流水线(release-promote)— 本仓库第一条流水线 +# +# 触发方式: 手动 (Drone Web 界面 → 打开 mixingx.deploy → NEW BUILD) +# 参数(可选,均有默认): +# RELEASE_VERSION — 交付版本号 v1.0.1;不传则自动递增 patch(查 chart 仓库上一个 tag) +# CUSTOMER — 客户目录名,默认 mxlexus +# PROMOTE_PROTOCOLS — true 时连 protocol mock 镜像一起晋级,默认 false(现场不部署) +# +# 职责(五步,详见 ci/promote.sh): +# prepare: 解析版本号 + 读 demo 交付基线 + 核对交付镜像清单 +# retag : 16 业务镜像 develop-* → v1.0.x,bit 级复制推 ACR(ADR-0067) +# chart : chart 仓库 bump Chart.yaml + 打 tag chart-v1.0.x +# pin : release 分支客户目录钉版(镜像 tag + chart tag) +# +# 边界: +# - 不构建任何镜像(构建属于 9 个源码仓库的流水线) +# - 不触碰 deploy master(demo 写回由构建流水线负责) +# - git push 凭证走 Drone netrc 自动注入;推 ACR 走 secrets(acr_push_*) +# - 凭证禁止走构建参数(会明文进构建历史,ADR-0066) +# +# Secrets (Drone → mixingx.deploy → Settings → Secrets): +# acr_push_username / acr_push_password — ACR 推送凭证(✅ 已配置) +# ============================================================================ + +kind: pipeline +type: docker +name: release-promote + +trigger: + event: + - custom # 仅手动触发;push 事件(demo 写回)不触发任何东西 + +steps: + # ═══════════════════════════════════════════ + # Step 1: 准备 — 版本号 + 交付基线 + 镜像清单核对 + # ═══════════════════════════════════════════ + - name: prepare + image: 192.168.1.119:8888/mixingx/gitops-tools:latest + pull: if-not-exists + commands: + - sh ci/promote.sh prepare + + # ═══════════════════════════════════════════ + # Step 2: 镜像晋级 — pull 119 → tag ACR → push + # ═══════════════════════════════════════════ + - name: retag-images + image: docker:24-dind + pull: if-not-exists + privileged: true + volumes: + - name: dockersock + path: /var/run/docker.sock + environment: + ACR_USER: + from_secret: acr_push_username + ACR_PASS: + from_secret: acr_push_password + ACR_REGISTRY: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com + HARBOR_REGISTRY: 192.168.1.119:8888/mixingx + commands: + - sh ci/promote.sh retag + + # ═══════════════════════════════════════════ + # Step 3: chart 版本化 — bump Chart.yaml + tag chart-v1.0.x + # ═══════════════════════════════════════════ + - name: chart-tag + image: 192.168.1.119:8888/mixingx/gitops-tools:latest + pull: if-not-exists + commands: + - sh ci/promote.sh chart + + # ═══════════════════════════════════════════ + # Step 4: 交付分支钉版 — release 分支客户目录 + # ═══════════════════════════════════════════ + - name: pin-release + image: 192.168.1.119:8888/mixingx/gitops-tools:latest + pull: if-not-exists + commands: + - sh ci/promote.sh pin + +volumes: + - name: dockersock + host: + path: /var/run/docker.sock diff --git a/ci/auto-bump.sh b/ci/auto-bump.sh new file mode 100755 index 0000000..cbb2b1b --- /dev/null +++ b/ci/auto-bump.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# ============================================================================ +# ci/auto-bump.sh — 交付版本号自动递增(release-promote 未传 RELEASE_VERSION 时调用) +# +# 规则: 查 chart 仓库已有 chart-vX.Y.Z tag 的最大值,patch +1; +# 无任何 tag 时从 v1.0.1 起步(与现有 appVersion 1.0.1 谱系对齐)。 +# 输出: v1.0.2 这样的版本号(stdout,单行) +# ============================================================================ +set -eu +CHART_REPO="${CHART_REPO:-https://gitee.com/mixing-tech/mixingx.hub.chart.git}" + +latest=$(git ls-remote --tags "$CHART_REPO" 'refs/tags/chart-v*' \ + | sed -E 's#.*refs/tags/chart-v##' \ + | sort -t. -k1,1n -k2,2n -k3,3n | tail -1 || true) + +if [ -z "$latest" ]; then + echo "v1.0.1" + exit 0 +fi + +major=$(echo "$latest" | cut -d. -f1) +minor=$(echo "$latest" | cut -d. -f2) +patch=$(echo "$latest" | cut -d. -f3) +patch=$((patch + 1)) +echo "v${major}.${minor}.${patch}" diff --git a/ci/promote.sh b/ci/promote.sh new file mode 100755 index 0000000..9551450 --- /dev/null +++ b/ci/promote.sh @@ -0,0 +1,230 @@ +#!/bin/sh +# ============================================================================ +# ci/promote.sh — 交付晋级脚本(release-promote 流水线的执行体)— ADR-0067 +# +# 子命令(由 .drone.yml 的四个 step 分别调用,状态经 /drone/src/.release-env +# 与 /drone/src/.baseline 文件在 step 间传递): +# +# prepare 解析 RELEASE_VERSION/CUSTOMER,读 demo image-version 的 develop tag +# 组合(= 交付基线),克隆 chart 仓库核对交付镜像清单 +# retag 交付基线镜像 pull 119 → tag ACR:v1.0.x → push(bit 级复制,不重新构建) +# chart chart 仓库 10 个 Chart.yaml bump + commit + tag chart-v1.0.x + push +# pin deploy release 分支:客户 image-version 钉 v1.0.x + +# applications 客户目录 targetRevision 钉 chart tag + push +# +# 原则: +# - 交付基线 = demo 正在跑且回归过的 develop tag 组合(只读 master,不改 master) +# - 客户目录只允许本流水线写(release 分支受保护,ADR-0068) +# - 任何一步失败即终止,不留半成品(ACR 里的 v1.0.x tag 幂等可重推) +# ============================================================================ +set -eu + +WS="${DRONE_WORKSPACE:-/drone/src}" +ENV_FILE="$WS/.release-env" +BASELINE_FILE="$WS/.baseline" +CHART_DIR="$WS/.ci/chart" +DEPLOY_REPO="${DEPLOY_REPO:-https://gitee.com/mixing-tech/mixingx.deploy.git}" +CHART_REPO="${CHART_REPO:-https://gitee.com/mixing-tech/mixingx.hub.chart.git}" +CHARTS_DIR="release-charts" + +log() { echo "[promote] $*"; } +die() { echo "[promote] 错误: $*" >&2; exit 1; } + +git_setup() { + git config --global url."https://gitee.com/".insteadOf "git@gitee.com:" 2>/dev/null || true + git config user.name "Drone Release" + git config user.email "drone-release@mixingx.local" +} + +require_env() { + [ -f "$ENV_FILE" ] || die "缺少 $ENV_FILE,请先运行 prepare 步骤" + . "$ENV_FILE" + [ -n "${RELEASE_VERSION:-}" ] && [ -n "${CUSTOMER:-}" ] && [ -n "${CHART_TAG:-}" ] \ + || die "$ENV_FILE 内容不完整" +} + +# ───────────────────────────────────────────── +# prepare +# ───────────────────────────────────────────── +do_prepare() { + CUSTOMER="${CUSTOMER:-mxlexus}" + RELEASE_VERSION="${RELEASE_VERSION:-$(sh ci/auto-bump.sh)}" + case "$RELEASE_VERSION" in + v[0-9]*.[0-9]*.[0-9]*) : ;; + *) die "RELEASE_VERSION 格式应为 vX.Y.Z,收到: $RELEASE_VERSION" ;; + esac + CHART_TAG="chart-$RELEASE_VERSION" + + log "交付版本: $RELEASE_VERSION 客户: $CUSTOMER chart tag: $CHART_TAG" + + # 防重复发布:chart tag 已存在即拒绝(交付版本号不可变) + if git ls-remote --tags "$CHART_REPO" "refs/tags/$CHART_TAG" | grep -q .; then + die "$CHART_TAG 已存在于 chart 仓库,交付版本不可复用;请递增版本号" + fi + + # 读 demo 交付基线(此刻 master 的 develop tag 组合 = demo 正跑且回归过的版本) + python3 - "$WS/environments/demo/image-version.yaml" "$BASELINE_FILE" "${PROMOTE_PROTOCOLS:-false}" <<'PY' +import sys, yaml +src, dst, with_protocols = sys.argv[1], sys.argv[2], sys.argv[3] == "true" +data = yaml.safe_load(open(src, encoding="utf-8")) +images = data.get("images") or {} +lines = [] +def walk(prefix, node): + for k, v in node.items(): + key = f"{prefix}.{k}" if prefix else k + if isinstance(v, dict): + walk(key, v) + else: + lines.append((key, v.get("repository", ""), v.get("tag", ""))) +walk("", images) +out, skipped = [], [] +for key, repo, tag in lines: + if key.startswith("protocol.") and not with_protocols: + skipped.append(key); continue + if not repo or not tag: + sys.exit(f"[promote] 错误: demo image-version 中 {key} 缺 repository/tag") + out.append(f"{repo} {tag}") +open(dst, "w", encoding="utf-8").write("\n".join(out) + "\n") +print(f"[promote] 交付基线 {len(out)} 个镜像: " + ", ".join(r for r, _ in out)) +if skipped: print(f"[promote] 跳过 protocol 镜像: {', '.join(skipped)}") +PY + + # 克隆 chart 仓库(供 chart 步骤复用)并核对交付镜像清单 + rm -rf "$WS/.ci"; mkdir -p "$WS/.ci" + git clone -q "$CHART_REPO" "$CHART_DIR" + python3 - "$CHART_DIR/delivery/image-manifest.yaml" <<'PY' +import sys, yaml +m = yaml.safe_load(open(sys.argv[1], encoding="utf-8")) or {} +missing = [e["acr"] for e in m.get("thirdParty", []) + if not e.get("optional") and not e.get("pushed")] +if missing: + sys.exit("[promote] 错误: 交付镜像清单存在未推送 ACR 的非可选镜像: " + ", ".join(missing) + + "\n 请先按 D2 用 cr_temp_user 临时 token 补推,再执行发布") +print("[promote] 交付镜像清单核对通过(第三方镜像齐备)") +PY + + cat > "$ENV_FILE" </dev/null 2>&1 || true + done < "$BASELINE_FILE" + log "镜像晋级完成: $(wc -l < "$BASELINE_FILE" | tr -d ' ') 个 → $ACR_REGISTRY/mixingx/*:$RELEASE_VERSION" +} + +# ───────────────────────────────────────────── +# chart +# ───────────────────────────────────────────── +do_chart() { + require_env + git_setup + [ -d "$CHART_DIR/.git" ] || { rm -rf "$CHART_DIR"; git clone -q "$CHART_REPO" "$CHART_DIR"; } + cd "$CHART_DIR" + + VER="${RELEASE_VERSION#v}" + for f in $CHARTS_DIR/*/Chart.yaml; do + python3 - "$f" "$VER" <<'PY' +import sys, re +path, ver = sys.argv[1], sys.argv[2] +t = open(path, encoding="utf-8").read() +t = re.sub(r'(?m)^version:\s*\S+', f'version: {ver}', t) +t = re.sub(r'(?m)^appVersion:\s*"?[^"\n]+"?', f'appVersion: "{ver}"', t) +open(path, "w", encoding="utf-8").write(t) +PY + done + git add -A + git diff --cached --quiet && die "Chart.yaml 无变化,异常(版本号相同?)" + git commit -q -m "release: bump chart version to $RELEASE_VERSION" + git tag "$CHART_TAG" + git push -q origin HEAD:master "refs/tags/$CHART_TAG" || die "chart 仓库 push 失败(netrc 凭证?)" + log "chart 已发布: $CHART_TAG(10 个 chart version=$VER)" +} + +# ───────────────────────────────────────────── +# pin +# ───────────────────────────────────────────── +do_pin() { + require_env + git_setup + cd "$WS" + + git fetch -q origin release || die "release 分支不存在,请先推送初始 release 分支(改造清单 B1)" + git checkout -q -B release origin/release + + ENVDIR="environments/$CUSTOMER" + APPDIR="applications/$CUSTOMER" + [ -d "$ENVDIR" ] || die "客户目录不存在: $ENVDIR" + [ -d "$APPDIR" ] || die "客户目录不存在: $APPDIR" + + # 1) image-version 全部钉到交付版本(保留 repository 映射,protocol 整段删除) + python3 - "$ENVDIR/image-version.yaml" "$RELEASE_VERSION" <<'PY' +import sys, yaml +path, ver = sys.argv[1], sys.argv[2] +data = yaml.safe_load(open(path, encoding="utf-8")) or {} +data.pop("protocol", None) +def pin(node): + for k, v in node.items(): + if isinstance(v, dict): pin(v) + elif k == "tag": node[k] = ver +for key in ("images",): + if key in data: pin(data[key]) +if "images" in data: data["images"].pop("protocol", None) +data["tag"] = ver +yaml.safe_dump(data, open(path, "w", encoding="utf-8"), + default_flow_style=False, sort_keys=False, allow_unicode=True) +print(f"[promote] {path} 已钉版 {ver}") +PY + + # 2) applications 客户目录的 chart targetRevision → 新 chart tag + # (只替换 chart-vX.Y.Z 模式;deploy 仓库自身的 targetRevision: release 不动) + sed -i.bak -E "s/chart-v[0-9]+\\.[0-9]+\\.[0-9]+/$CHART_TAG/g" "$APPDIR"/*.yaml + rm -f "$APPDIR"/*.yaml.bak + grep -rn "$CHART_TAG" "$APPDIR" >/dev/null || die "$APPDIR 中未找到可替换的 chart targetRevision" + + git add "$ENVDIR" "$APPDIR" + git diff --cached --quiet && die "钉版后无变化(版本号未变?)" + BASELINE_TAGS=$(sed 's/^/ /' "$BASELINE_FILE") + git commit -q -m "release: $CUSTOMER 钉版 $RELEASE_VERSION + +交付基线(develop tag 组合,源自 demo image-version): +$BASELINE_TAGS +chart: $CHART_TAG" + git push -q origin release || die "release 分支 push 失败(分支保护?netrc 凭证?)" + log "交付分支已钉版: environments/$CUSTOMER → $RELEASE_VERSION" + log "" + log "════════ 发布完成 ════════" + log "版本: $RELEASE_VERSION (chart: $CHART_TAG)" + log "现场: ArgoCD 约 3 分钟内自动 sync" +} + +case "${1:-}" in + prepare) do_prepare ;; + retag) do_retag ;; + chart) do_chart ;; + pin) do_pin ;; + *) echo "用法: promote.sh prepare|retag|chart|pin" >&2; exit 1 ;; +esac