From d64ce6405645ee174d40d825e64e39cc60471286 Mon Sep 17 00:00:00 2001
From: kdletters <kdletters@qq.com>
Date: Sun, 20 Sep 2026 18:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20AGC=20=E5=8F=91=E5=8F=B7?=
 =?UTF-8?q?=20Job=20=E7=9A=84=20ossutil=20=E5=BC=95=E5=AF=BC=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

官方 ossutil v2 zip 解压后带版本目录，先定位二进制再落到工作区固定路径
避免 chmod 找不到文件导致发号 Job 在引导阶段失败
---
 jenkins/Jenkinsfile.agc-global-version-issue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jenkins/Jenkinsfile.agc-global-version-issue b/jenkins/Jenkinsfile.agc-global-version-issue
index 7cda374df..ece6304ed 100644
--- a/jenkins/Jenkinsfile.agc-global-version-issue
+++ b/jenkins/Jenkinsfile.agc-global-version-issue
@@ -91,7 +91,14 @@ pipeline {
               if [[ ! -x "${OSSUTIL_TOOLS_DIR}/ossutil" ]]; then
                 curl -fsSL -o "${OSSUTIL_TOOLS_DIR}/ossutil.zip" \\
                   "https://gosspublic.alicdn.com/ossutil/v2/${version}/ossutil-${version}-linux-amd64.zip"
+                # 官方 zip 解压后是带版本号的目录，二进制不在包根，必须先定位再落到固定路径。
                 unzip -o -q "${OSSUTIL_TOOLS_DIR}/ossutil.zip" -d "${OSSUTIL_TOOLS_DIR}"
+                extracted="$(find "${OSSUTIL_TOOLS_DIR}" -maxdepth 3 -type f -name ossutil -print -quit)"
+                if [[ -z "${extracted}" ]]; then
+                  echo "ossutil 解压后未找到可执行文件：${OSSUTIL_TOOLS_DIR}" >&2
+                  exit 1
+                fi
+                cp -f "${extracted}" "${OSSUTIL_TOOLS_DIR}/ossutil"
                 chmod +x "${OSSUTIL_TOOLS_DIR}/ossutil"
               fi
               "${OSSUTIL_TOOLS_DIR}/ossutil" --version | head -1