From fc9297cd6b82a9e1695bedd4d57c1d54d987daf0 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Sat, 22 Aug 2026 13:41:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(promote):=20CUSTOMER=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=98=B2=E5=91=86=E2=80=94=E2=80=94=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=9B=AE=E5=BD=95=E6=89=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=BC=BA=E7=9C=81,=E5=A4=9A=E5=AE=A2=E6=88=B7=E6=97=B6?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=98=BE=E5=BC=8F=E6=8C=87=E5=AE=9A(?= =?UTF-8?q?=E9=98=B2=E5=8F=91=E9=94=99=E7=8E=B0=E5=9C=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3849548087c1a48eb1cc533037270b4630f1557c) --- ci/promote.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ci/promote.sh b/ci/promote.sh index 9551450..51dabe0 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -47,7 +47,20 @@ require_env() { # prepare # ───────────────────────────────────────────── do_prepare() { - CUSTOMER="${CUSTOMER:-mxlexus}" + # 客户解析:唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场) + CUSTOMERS=$(ls -1 "$WS/environments" 2>/dev/null | grep -vE '^(_common|demo|dev)$' || true) + C_COUNT=$(printf '%s\n' "$CUSTOMERS" | grep -c . || true) + if [ -z "${CUSTOMER:-}" ]; then + if [ "$C_COUNT" = "1" ]; then + CUSTOMER="$CUSTOMERS" + log "未指定 CUSTOMER,唯一客户目录: $CUSTOMER" + else + die "检测到 ${C_COUNT} 个客户目录,不填 CUSTOMER 无法确定发给谁。现有客户: $(printf '%s ' $CUSTOMERS)" + fi + fi + [ -d "$WS/environments/$CUSTOMER" ] \ + || die "environments/$CUSTOMER 不存在。现有客户: $(printf '%s ' $CUSTOMERS)" + RELEASE_VERSION="${RELEASE_VERSION:-$(sh ci/auto-bump.sh)}" case "$RELEASE_VERSION" in v[0-9]*.[0-9]*.[0-9]*) : ;; From 3549746cdc97a5d6c9096df4197200c1e5d625d3 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Sat, 22 Aug 2026 13:45:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(promote):=20=E5=9F=BA=E7=BA=BF=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E9=80=82=E9=85=8D=E7=9C=9F=E5=AE=9E=E4=B8=A4=E5=B1=82?= =?UTF-8?q?=E7=BB=93=E6=9E=84(=E4=BF=AE=E5=A4=8D=20walk=20=E5=8F=B6?= =?UTF-8?q?=E5=AD=90=E8=AF=AF=E5=BD=93=20dict=20+=20=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=A7=A3=E5=8C=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e2375a49d2418accd52a1a72156c43a0b5ef7083) --- ci/promote.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/promote.sh b/ci/promote.sh index 51dabe0..41ffa2a 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -85,10 +85,12 @@ 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) + if not isinstance(v, dict): + continue + if "repository" in v and "tag" in v: + lines.append((key, v["repository"], v["tag"])) else: - lines.append((key, v.get("repository", ""), v.get("tag", ""))) + walk(key, v) walk("", images) out, skipped = [], [] for key, repo, tag in lines: @@ -98,7 +100,7 @@ for key, repo, tag in lines: 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)) +print(f"[promote] 交付基线 {len(out)} 个镜像: " + ", ".join(l.split()[0] for l in out)) if skipped: print(f"[promote] 跳过 protocol 镜像: {', '.join(skipped)}") PY From b6f1097d30e60490377afc067a8a11999cb9e5a9 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Sat, 22 Aug 2026 13:49:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(promote):=20=E5=AE=A2=E6=88=B7=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=89=AB=E6=8F=8F=E6=94=B9=E7=94=A8=20release=20?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=A0=91(=E5=B7=A5=E4=BD=9C=E5=8C=BA=20maste?= =?UTF-8?q?r=20=E6=97=A0=E5=AE=A2=E6=88=B7=E7=9B=AE=E5=BD=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/promote.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/promote.sh b/ci/promote.sh index 41ffa2a..cbd896c 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -47,8 +47,11 @@ require_env() { # prepare # ───────────────────────────────────────────── do_prepare() { - # 客户解析:唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场) - CUSTOMERS=$(ls -1 "$WS/environments" 2>/dev/null | grep -vE '^(_common|demo|dev)$' || true) + # 客户解析:客户目录在 release 分支上(工作区是 master,不含客户目录) + # 唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场) + git fetch -q origin release || die "release 分支不存在,请先推送初始 release 分支" + CUSTOMERS=$(git ls-tree --name-only "origin/release" environments/ 2>/dev/null \ + | sed 's#^environments/##' | sed 's#/$##' | grep -vE '^(_common|demo|dev)$' || true) C_COUNT=$(printf '%s\n' "$CUSTOMERS" | grep -c . || true) if [ -z "${CUSTOMER:-}" ]; then if [ "$C_COUNT" = "1" ]; then @@ -58,8 +61,8 @@ do_prepare() { die "检测到 ${C_COUNT} 个客户目录,不填 CUSTOMER 无法确定发给谁。现有客户: $(printf '%s ' $CUSTOMERS)" fi fi - [ -d "$WS/environments/$CUSTOMER" ] \ - || die "environments/$CUSTOMER 不存在。现有客户: $(printf '%s ' $CUSTOMERS)" + printf '%s\n' "$CUSTOMERS" | grep -qx "$CUSTOMER" \ + || die "environments/$CUSTOMER 不在 release 分支上。现有客户: $(printf '%s ' $CUSTOMERS)" RELEASE_VERSION="${RELEASE_VERSION:-$(sh ci/auto-bump.sh)}" case "$RELEASE_VERSION" in