From 752116fe416ac49a84819dc9ebf06e67739fc894 Mon Sep 17 00:00:00 2001
From: kdletters <kdletters@qq.com>
Date: Sun, 20 Sep 2026 18:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=8F=AF=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=80=A7=E6=A0=A1=E9=AA=8C=E7=A1=AE=E8=AE=A4=20ossutil=20?=
 =?UTF-8?q?=E5=B0=B1=E7=BB=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ossutil v2 不支持 --version，版本打印会误判为失败
引导阶段只校验二进制存在且可执行，具体命令错误仍由发号步骤暴露
---
 jenkins/Jenkinsfile.agc-global-version-issue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jenkins/Jenkinsfile.agc-global-version-issue b/jenkins/Jenkinsfile.agc-global-version-issue
index ece6304ed..62b43f220 100644
--- a/jenkins/Jenkinsfile.agc-global-version-issue
+++ b/jenkins/Jenkinsfile.agc-global-version-issue
@@ -101,7 +101,12 @@ pipeline {
                 cp -f "${extracted}" "${OSSUTIL_TOOLS_DIR}/ossutil"
                 chmod +x "${OSSUTIL_TOOLS_DIR}/ossutil"
               fi
-              "${OSSUTIL_TOOLS_DIR}/ossutil" --version | head -1
+              # ossutil v2 没有 `--version` 选项，这里用可执行性校验代替版本打印，避免误判失败。
+              if [[ ! -x "${OSSUTIL_TOOLS_DIR}/ossutil" ]]; then
+                echo "ossutil 未就绪：${OSSUTIL_TOOLS_DIR}/ossutil" >&2
+                exit 1
+              fi
+              echo "ossutil ready: ${OSSUTIL_TOOLS_DIR}/ossutil"
             '''
             env.EFFECTIVE_OSSUTIL_BIN = "${env.WORKSPACE}/${env.OSSUTIL_TOOLS_DIR}/ossutil"
           }