diff --git a/ci/promote.sh b/ci/promote.sh index 25506b8..a670e2e 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -58,6 +58,10 @@ # 其他参数: # CHART_ONLY=true 只发 chart:prepare 跳过镜像基线与 Harbor 校验,retag 整步跳过, # pin 只动 chart targetRevision 与 release-notes +# ASSIGN_VERSION 是否分配新版本号(缺省 true)。false = 纯钉版发布: +# 不分配版本号、不 bump chart、不动平台 Application, +# 只钉 values/image-version 与 release-notes;此时 PLAN 中 +# 不得有 deliver/ci-now(镜像 retag 的目标名就是版本号,必须有号) # RELEASE_NOTES 发布说明,写入 release-notes.yaml 条目 # DB_CHANGE 逗号分隔服务名(须为本次非 keep 服务子集),条目 dbChange 标 true # (仅作 release-notes/commit 标记,提示运维本次含数据库变更; @@ -444,8 +448,17 @@ PY . "$FACTS_FILE" # HAS_DELIVER=true|false # ── 版本号与 chart tag 分配 ── + ASSIGN_VERSION="${ASSIGN_VERSION:-true}" + case "$ASSIGN_VERSION" in true|false) : ;; *) die "ASSIGN_VERSION 只接受 true/false,收到: $ASSIGN_VERSION" ;; esac + HAS_REAL_DELIVER=$(python3 -c " +import json +plan = json.load(open('$PLAN_FILE')) +print('true' if any(e['action'] in ('deliver','ci-now') for e in plan) else 'false')") + if [ "$ASSIGN_VERSION" = "false" ] && [ "$HAS_REAL_DELIVER" = "true" ]; then + die "ASSIGN_VERSION=false 与 deliver/ci-now 互斥:镜像 retag 的目标名就是版本号,交付必须分配" + fi GIVEN_VERSION="${RELEASE_VERSION:-}" - if [ "$HAS_DELIVER" = "true" ] || [ "$CHART_ONLY" = "true" ]; then + if [ "$ASSIGN_VERSION" = "true" ] && { [ "$HAS_DELIVER" = "true" ] || [ "$CHART_ONLY" = "true" ]; }; then RELEASE_VERSION="${GIVEN_VERSION:-$(sh ci/auto-bump.sh)}" case "$RELEASE_VERSION" in v[0-9]*.[0-9]*.[0-9]*) : ;; @@ -462,11 +475,12 @@ PY PURE_REUSE=false log "交付版本: $RELEASE_VERSION 客户: $CUSTOMER chart tag: $CHART_TAG" else - # 纯复用发布(全部 keep/reuse):不需要新版本号,chart 步骤整体跳过 + # 无需新版本号(纯复用,或 ASSIGN_VERSION=false 的纯钉版):chart 步骤整体跳过 RELEASE_VERSION=""; CHART_TAG=""; CHART_TAG_EXISTS=false; PURE_REUSE=true - [ -z "$GIVEN_VERSION" ] || log "警告: 纯复用发布不需要新版本号,已忽略传入的 $GIVEN_VERSION" - log "纯复用发布(无 deliver/ci-now):不分配新版本号,chart 步骤将跳过" + [ -z "$GIVEN_VERSION" ] || log "警告: 本次发布不分配新版本号,已忽略传入的 $GIVEN_VERSION" + log "本次发布不分配新版本号,chart 步骤将跳过" fi + export ASSIGN_VERSION # 克隆 chart 仓库(供 chart 步骤复用)并核对交付镜像清单 rm -rf "$WS/.ci"; mkdir -p "$WS/.ci" @@ -493,6 +507,7 @@ PY echo "CHART_TAG_EXISTS=$CHART_TAG_EXISTS" echo "CHART_ONLY=$CHART_ONLY" echo "PURE_REUSE=$PURE_REUSE" + echo "ASSIGN_VERSION=$ASSIGN_VERSION" echo "OPERATOR=$(shq "$OPERATOR")" echo "RELEASE_NOTES=$(shq "$RELEASE_NOTES")" echo "DB_CHANGE=$(shq "$DB_CHANGE")" @@ -802,6 +817,10 @@ for e in actions: if not e["appFile"]: print(f"[promote] {e['service']}: 无 appFile 映射,chart 引用不动(独立 chart 服务)") continue + if e["action"] == "pin-acr" and not CHART_TAG: + # 未分配版本号(ASSIGN_VERSION=false):只钉镜像 tag,chart 引用不动 + print(f"[promote] {e['service']}: 未分配版本号,chart 引用不动") + continue new_ref = CHART_TAG if e["action"] in ("deliver", "ci-now", "pin-acr") else f"chart-{e['version']}" r = retarget(os.path.join(appdir, e["appFile"]), new_ref, required=True) if r: @@ -888,7 +907,8 @@ else: # ── 5) commit message:服务清单(action/from→to)与 RELEASE_NOTES ── if PURE_REUSE: - title = f"release: {CUSTOMER} 纯复用发布(无新版本号)" + kind = "钉版发布" if svc_entries else "纯复用发布" + title = f"release: {CUSTOMER} {kind}(无新版本号)" elif CHART_ONLY: title = f"release: {CUSTOMER} chart 交付 {CHART_TAG}(CHART_ONLY)" else: