2-11同步

SCM/部署镜像/s6/DM_s6_lessie_ai_web.groovy

@@ -8,6 +8,35 @@ def getHiddenParams() {
     return results
 }
 
+// 飞书通知函数 - 带重试机制，防止限频导致 Job 失败
+def sendLarkNotification(String robot, String type, String title, List text) {
+    def retryCount = env.LARK_RETRY_COUNT.toInteger()
+    def retryDelay = env.LARK_RETRY_DELAY.toInteger()
+
+    for (int i = 0; i < retryCount; i++) {
+        try {
+            lark(
+                robot: robot,
+                type: type,
+                title: title,
+                text: text
+            )
+            echo "飞书通知发送成功"
+            return true
+        } catch (Exception e) {
+            echo "飞书通知发送失败 (第 ${i+1}/${retryCount} 次): ${e.message}"
+            if (i < retryCount - 1) {
+                echo "等待 ${retryDelay} 秒后重试..."
+                sleep(retryDelay)
+            }
+        }
+    }
+
+    echo "⚠️ 飞书通知发送失败，已重试 ${retryCount} 次，但不影响部署结果"
+    return false
+}
+
+
 pipeline {
     agent any
 
@@ -33,16 +62,19 @@ pipeline {
             defaultValue: false,
             description: '是否快速回滚上一个版本?'
         )
-        choice(
-            name: 'BRANCH_NAME',
-            choices: ['dxin', 'opt'],
-            description: '选择资源清单Yaml的分支'
-        )
     }
     environment {
-        LARK_ROBOT = "4b8d66d0-c0f0-4587-b0e5-cff772cb3046"  // 飞书机器人ID，用于发送部署通知
+        // ========== 超时配置 ==========
+        ROLLBACK_TIMEOUT = "120s"          // 回滚超时时间
+        DEPLOYMENT_TIMEOUT = "300s"       // 部署超时时间
+
+        // ========== 飞书通知配置 ==========
+        LARK_ROBOT = "4b8d66d0-c0f0-4587-b0e5-cff772cb3046"  // 飞书机器人ID
+        LARK_RETRY_COUNT = "3"            // 飞书通知重试次数
+        LARK_RETRY_DELAY = "2"            // 飞书通知重试间隔(秒)
+
+        // ========== K8s 配置 ==========
         KUBECONFIG = credentials('k8s-test-config-admin')  // k8s 凭证 ID, Jenkins 中配置的凭证名称
-        Deployment_yaml = "${WORKSPACE}/lessie-ai/sit/s6/lessie-ai-web.yaml"
         Deployment_name = "s6-lessie-ai-web"
         K8s_namespace = "sit"
         Pod_container_name = "lessie-ai-web"
@@ -54,18 +86,19 @@ pipeline {
             steps {
                 script {
                     sh """
-                    echo "=== 开始回滚到上一个版本 ==="
+                    echo "开始回滚到上一个版本"
                     kubectl rollout undo deployment/${Deployment_name} -n ${K8s_namespace}
-                    echo "=== 回滚中... ==="
-                    kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s
-                    echo "=== 查看所使用的镜像 ==="
+                    echo "回滚中"
+                    kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=${ROLLBACK_TIMEOUT}
+                    echo "查看所使用的镜像"
                     kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}'
-                    echo "=== 回滚完成 ==="
+                    echo "回滚完成"
                     """
                 }
             }
         }
         stage('决定镜像') {
+            when { expression { return params.ROLLBACK_VERSION == false } }
             steps {
                 script {
                     // 调用上面的非 CPS 方法，安全拿值
@@ -86,7 +119,7 @@ pipeline {
                         def matcher = (customImage =~ imageRegex)
                         if (!matcher.matches()) {
                             error "CUSTOM_IMAGE 格式不正确，必须是 registry/namespace/repository:tag 格式\n" +
-                                "示例: uswccr.ccs.tencentyun.com/lessie-ai-web:v1.0.0\n" +
+                                "示例: uswccr.ccs.tencentyun.com/lessiesit/apex:v1.0.0\n" +
                                 "当前输入: ${customImage}"
                         }
 
@@ -123,51 +156,20 @@ pipeline {
                 }
             }
         }
-        stage('拉取yaml') {
-            when { expression { return params.ROLLBACK_VERSION == false } }
-            steps {
-                git branch: "${params.BRANCH_NAME}", 
-                credentialsId: 'fly_gitlab_auth', 
-                url: 'http://172.24.16.20/opt/opt-config.git'
-            }
-        }
-        stage('修改YAML') {
-            when { expression { return params.ROLLBACK_VERSION == false } }
-            steps {
-                script {
-                    def oldImg = sh (
-                        script: """
-                            kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}'  2>/dev/null || echo "无（可能是首次部署）"
-                            """,
-                        returnStdout: true
-                    ).trim()
-                    env.OLD_IMAGE_NAME = oldImg
-                    echo "--- 目前正常运行的旧镜像: ${OLD_IMAGE_NAME} ---"
-                    echo "--- 所选择新的镜像: ${env.IMAGE_FULL_NAME} ---"
-                    echo "--- 修改 Deployment YAML 中的镜像为新镜像版本 ---"
-                    sh """
-                        sed -i 's#image:.*#image: ${IMAGE_FULL_NAME}#' ${Deployment_yaml}
-                    """
-                }
-            }
-        }
-        stage('部署k8s') {
+        stage('更新镜像') {
             when { expression { return params.ROLLBACK_VERSION == false } } 
             steps {
                 script {
-                    def ANNOTATION = "更新 image 为 ${IMAGE_FULL_NAME}"
+                    echo "保存当前镜像信息"
+                    env.OLD_IMAGE_NAME = sh(
+                        script: "kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[0].image}'",
+                        returnStdout: true
+                    ).trim()
+                    echo "更新前镜像: ${env.OLD_IMAGE_NAME}"
+
                     sh """
-                        echo "===Apply Deployment YAML ==="
-                        kubectl apply -f ${Deployment_yaml} -n ${K8s_namespace}
-
-                        echo "=== 查看当前新使用的镜像 ==="
-                        kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}'
-
-                        echo "=== 添加注解 ==="
-                        kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${ANNOTATION}" --overwrite -n ${K8s_namespace}
-
-                        echo "=== 查看历史版本 ==="
-                        kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} 
+                        echo "更新Deployment: ${Deployment_name} 镜像为: ${IMAGE_FULL_NAME}"
+                        kubectl set image deployment/${Deployment_name} ${Pod_container_name}=${IMAGE_FULL_NAME} -n ${K8s_namespace}
                     """
                 }
             }
@@ -176,10 +178,9 @@ pipeline {
             when { expression { return params.ROLLBACK_VERSION == false } }
             steps {
                 script {
-                    echo "=== 检测部署状态并验证新版本运行情况 ==="
-                    echo "--- 检查 Deployment 更新状态 ---"
+                    echo "检测部署状态并验证新版本运行情况"
                     def rolloutStatus = sh(
-                        script: "kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s",
+                        script: "kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=${DEPLOYMENT_TIMEOUT}",
                         returnStatus: true
                     )
                 
@@ -223,124 +224,71 @@ pipeline {
                 }
             }
         }
-        stage('变更说明') {
-            when { expression { return params.ROLLBACK_VERSION == false } }
-            steps {
-                script {
-                    env.CHANGE_MSG = """
-jenkins执行人: ${env.ACTUAL_USER}
-修改时间: ${env.currentTime}
-旧镜像: ${OLD_IMAGE_NAME}
-新镜像: ${IMAGE_FULL_NAME}
-部署对象: ${Deployment_name}
-镜像标签: ${env.IMAGE_LABEL}
-                    """.stripIndent().trim()
-                    echo env.CHANGE_MSG
-                }
-            }
-        }
-        stage('提交变更') {
-            when { expression { return params.ROLLBACK_VERSION == false } }
-            steps {
-                script {
-                    withCredentials([usernamePassword(credentialsId: 'fly_gitlab_auth', usernameVariable: 'GIT_USER', passwordVariable: 'GIT_PASS')]) {
-                        sh """
-                            cd ${WORKSPACE}
-                            git config user.name "jenkins"
-                            git config user.email "jenkins@local"
-
-                            # 检查工作树是否有变化
-                            if ! git diff --exit-code ${Deployment_yaml} > /dev/null 2>&1; then
-                                echo "检测到更改，正在提交..."
-                                git add ${Deployment_yaml}
-                                git commit -m "更新镜像 \${CHANGE_MSG}"
-                            else
-                                echo "${Deployment_yaml} 没有变化, 无需commit"
-                            fi
-
-                            # 检查是否需要推送（是否有新的提交）
-                            LOCAL=\$(git rev-parse @)
-                            REMOTE=\$(git rev-parse @{u} 2>/dev/null || true)
-                            BASE=\$(git merge-base @ @{u} 2>/dev/null || true)
-
-                            if [ "\$LOCAL" = "\$REMOTE" ]; then
-                                echo "已与远程系统同步更新"
-                            elif [ "\$LOCAL" = "\$BASE" ]; then
-                                echo "需要从远程获取数据"
-                                git pull http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME}
-                            elif [ "\$REMOTE" = "\$BASE" ]; then
-                                echo "将更改推送到远程服务器..."
-                                # 生成临时 .netrc 文件
-                                echo "machine 172.24.16.20 login \$GIT_USER password \$GIT_PASS" > ~/.netrc
-                                chmod 600 ~/.netrc
-                                git push http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME}
-                            else
-                                echo "与远程模式不同，跳过推送操作"
-                            fi
-                        """
-                    }
-                }
-            }
-        }
     }
 
     post {
         success {
-            lark (
-                robot: "${LARK_ROBOT}",
-                type: "CARD",
-                title: "${Deployment_name}部署成功",
-                text: [
-                    "📅 **部署时间**: ${currentTime}",
-                    "📋 **任务名称**: [${JOB_NAME}](${JOB_URL})",
-                    "🔢 **任务编号**: [${BUILD_DISPLAY_NAME}](${BUILD_URL})",
-                    "🌟 **部署状态**: <font color='green'>部署成功</font>",
-                    "⏱️ **部署用时**: ${currentBuild.duration.intdiv(1000)} 秒",
-                    "📦 **部署镜像**: ${env.IMAGE_FULL_NAME}",
-                    "📝 **镜像摘要**: ${env.IMAGE_LABEL}",
-                    "📦 **上次镜像**: ${OLD_IMAGE_NAME}",
-                    "👤 **执行账号**: ${env.ACTUAL_USER}",
-                ]
-            )
-            echo "=== 部署成功，所选择镜像: ${IMAGE_FULL_NAME} ==="
+            script {
+                echo "部署成功，所选择镜像: ${IMAGE_FULL_NAME}"
+                sendLarkNotification(
+                    "${LARK_ROBOT}",
+                    "CARD",
+                    "${Deployment_name}部署成功",
+                    [
+                        "📅 **部署时间**: ${currentTime}",
+                        "📋 **任务名称**: [${JOB_NAME}](${JOB_URL})",
+                        "🔢 **任务编号**: [${BUILD_DISPLAY_NAME}](${BUILD_URL})",
+                        "🌟 **部署状态**: <font color='green'>部署成功</font>",
+                        "⏱️ **部署用时**: ${currentBuild.duration.intdiv(1000)} 秒",
+                        "📦 **部署镜像**: ${env.IMAGE_FULL_NAME}",
+                        "📝 **镜像摘要**: ${env.IMAGE_LABEL ?: '无'}",
+                        "📦 **上次镜像**: ${env.OLD_IMAGE_NAME ?: '无'}",
+                        "👤 **执行账号**: ${env.ACTUAL_USER}",
+                    ]
+                )
+            }
         }
         failure {
-            lark (
-                robot: "${LARK_ROBOT}",
-                type: "CARD",
-                title: "${Deployment_name}部署失败",
-                text: [
-                    "📅 **部署时间**: ${currentTime}",
-                    "📋 **任务名称**: [${JOB_NAME}](${JOB_URL})",
-                    "🔢 **任务编号**: [${BUILD_DISPLAY_NAME}](${BUILD_URL})",
-                    "🌟 **部署状态**: <font color='red'>部署失败</font>",
-                    "⏱️ **部署用时**: ${currentBuild.duration.intdiv(1000)} 秒",
-                    "📦 **部署镜像**: ${env.IMAGE_FULL_NAME}",
-                    "📝 **镜像摘要**: ${env.IMAGE_LABEL}",
-                    "📦 **上次镜像**: ${OLD_IMAGE_NAME}",
-                    "👤 **执行账号**: ${env.ACTUAL_USER}",
-                ]
-            )
-            echo "有步骤失败，请检查！"
+            script {
+                echo "有步骤失败，请检查！"
+                sendLarkNotification(
+                    "${LARK_ROBOT}",
+                    "CARD",
+                    "${Deployment_name}部署失败",
+                    [
+                        "📅 **部署时间**: ${currentTime}",
+                        "📋 **任务名称**: [${JOB_NAME}](${JOB_URL})",
+                        "🔢 **任务编号**: [${BUILD_DISPLAY_NAME}](${BUILD_URL})",
+                        "🌟 **部署状态**: <font color='red'>部署失败</font>",
+                        "⏱️ **部署用时**: ${currentBuild.duration.intdiv(1000)} 秒",
+                        "📦 **部署镜像**: ${env.IMAGE_FULL_NAME ?: '无'}",
+                        "📝 **镜像摘要**: ${env.IMAGE_LABEL ?: '无'}",
+                        "📦 **上次镜像**: ${env.OLD_IMAGE_NAME ?: '无'}",
+                        "👤 **执行账号**: ${env.ACTUAL_USER}",
+                    ]
+                )
+            }
         }
         aborted {
-            lark (
-                robot: "${LARK_ROBOT}",
-                type: "CARD",
-                title: "${Deployment_name}部署取消",
-                text: [
-                    "📅 **部署时间**: ${currentTime}",
-                    "📋 **任务名称**: [${JOB_NAME}](${JOB_URL})",
-                    "🔢 **任务编号**: [${BUILD_DISPLAY_NAME}](${BUILD_URL})",
-                    "🌟 **部署状态**: <font color='red'>部署取消</font>",
-                    "⏱️ **部署用时**: ${currentBuild.duration.intdiv(1000)} 秒",
-                    "📦 **部署镜像**: ${env.IMAGE_FULL_NAME}",
-                    "📝 **镜像摘要**: ${env.IMAGE_LABEL}",
-                    "📦 **上次镜像**: ${OLD_IMAGE_NAME}",
-                    "👤 **执行账号**: ${env.ACTUAL_USER}",
-                ]
-            )
-            echo "部署被中止！"
+            script {
+                echo "部署被中止！"
+                sendLarkNotification(
+                    "${LARK_ROBOT}",
+                    "CARD",
+                    "${Deployment_name}部署取消",
+                    [
+                        "📅 **部署时间**: ${currentTime}",
+                        "📋 **任务名称**: [${JOB_NAME}](${JOB_URL})",
+                        "🔢 **任务编号**: [${BUILD_DISPLAY_NAME}](${BUILD_URL})",
+                        "🌟 **部署状态**: <font color='red'>部署取消</font>",
+                        "⏱️ **部署用时**: ${currentBuild.duration.intdiv(1000)} 秒",
+                        "📦 **部署镜像**: ${env.IMAGE_FULL_NAME ?: '无'}",
+                        "📝 **镜像摘要**: ${env.IMAGE_LABEL ?: '无'}",
+                        "📦 **上次镜像**: ${env.OLD_IMAGE_NAME ?: '无'}",
+                        "👤 **执行账号**: ${env.ACTUAL_USER}",
+                    ]
+                )
+            }
         }
     }
 }