优化

Jenkinsfile.service

@@ -1,11 +1,10 @@
 def serviceModules = [
-    'gateway', 'gateway-overseas', 'auth', 'iam', 'firstleg', 'finance', 'order', 'warehouse', 'file', 'print',
-    'integration-service', 'lastleg-service', 'warehouse-overseas-service', 'event-bridge-service', 'audit-service'
+    'gateway', 'auth', 'iam', 'firstleg', 'finance', 'order', 'warehouse', 'file', 'print',
+    'integration-service', 'lastleg-service', 'warehouse-overseas-service', 'audit-service'
 ]
 
 def serviceJars = [
     'gateway': 'gateway/target/gateway-1.0.0-SNAPSHOT.jar',
-    'gateway-overseas': 'gateway-overseas/target/gateway-overseas-1.0.0-SNAPSHOT.jar',
     'auth': 'auth/target/auth-service-1.0.0-SNAPSHOT.jar',
     'iam': 'iam/target/iam-service-1.0.0-SNAPSHOT.jar',
     'firstleg': 'firstleg/target/firstleg-service-1.0.0-SNAPSHOT.jar',
@@ -17,18 +16,11 @@ def serviceJars = [
     'integration-service': 'integration-service/target/integration-service-1.0.0-SNAPSHOT.jar',
     'lastleg-service': 'lastleg-service/target/lastleg-service-1.0.0-SNAPSHOT.jar',
     'warehouse-overseas-service': 'warehouse-overseas-service/target/warehouse-overseas-service-1.0.0-SNAPSHOT.jar',
-    'event-bridge-service': 'event-bridge-service/target/event-bridge-service-1.0.0-SNAPSHOT.jar',
     'audit-service': 'audit-service/target/audit-service-1.0.0-SNAPSHOT.jar'
 ]
 
 def fixedEnvironmentForServiceJob(String jobBaseName) {
-    if (jobBaseName?.startsWith('baiyue-firstleg-dev-')) {
-        return 'development'
-    }
-    if (jobBaseName?.startsWith('baiyue-firstleg-prod-')) {
-        return 'production'
-    }
-    if (jobBaseName?.startsWith('baiyue-firstleg-')) {
+    if (jobBaseName?.startsWith('baiyue-firstleg-') && !jobBaseName.startsWith('baiyue-firstleg-dev-') && !jobBaseName.startsWith('baiyue-firstleg-prod-')) {
         return 'test'
     }
     return null
@@ -53,11 +45,11 @@ pipeline {
         string(name: 'SOURCE_COMMIT', defaultValue: '', description: '必须构建的 Git commit；通常由总控 Job 传入')
         string(name: 'IMAGE_TAG', defaultValue: '', description: '不可变镜像标签；通常使用 Git commit 前 12 位')
         choice(name: 'ENVIRONMENT', choices: environmentChoicesForServiceJob(env.JOB_BASE_NAME), description: '由当前单服务 Job 固定的部署环境')
+        booleanParam(name: 'ALLOW_SAME_CONTRACT_ROLLBACK', defaultValue: false, description: '仅确认相同协议与Schema时允许回滚；架构切换保持关闭')
         booleanParam(name: 'DEPLOY', defaultValue: false, description: '构建成功后是否部署本服务')
         booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: '是否跳过测试')
-        choice(name: 'EVENT_BRIDGE_REGION', choices: ['BOTH', 'CN', 'OVERSEAS', 'SELECT'], description: '仅 event-bridge-service 使用；BOTH 依次部署国内和海外实例；SELECT 为总控兼容值')
-        string(name: 'IMAGE_REPOSITORY', defaultValue: 'git.buggoglobal.com/java-project/baiyue-firstleg', description: '共享镜像仓库基础路径，不包含服务名和标签')
-        string(name: 'DOCKER_BASE_IMAGE', defaultValue: 'git.buggoglobal.com/java-project/eclipse-temurin:17-jre-alpine', description: 'Java 17 基础镜像')
+        string(name: 'IMAGE_REPOSITORY', defaultValue: 'registry.example.com/team/baiyue-firstleg', description: '共享镜像仓库基础路径，不包含服务名和标签')
+        string(name: 'DOCKER_BASE_IMAGE', defaultValue: 'eclipse-temurin:17-jre-alpine', description: 'Java 17 基础镜像')
     }
 
     environment {
@@ -98,12 +90,7 @@ pipeline {
                                 error("未配置单服务 Job ${env.JOB_BASE_NAME} 的固定部署环境，拒绝继续")
                             }
                             if (params.ENVIRONMENT != resolvedEnvironment) {
-                                echo "忽略外部传入的环境 ${params.ENVIRONMENT}；${env.JOB_BASE_NAME} 固定使用 ${resolvedEnvironment}"
-                            }
-                            boolean deployBothBridges = service == 'event-bridge-service' &&
-                                imageTag?.endsWith('-both')
-                            if (deployBothBridges) {
-                                imageTag = imageTag.substring(0, imageTag.length() - '-both'.length())
+                                error('当前单服务流水线仅允许 TEST')
                             }
                             if (!sourceCommit || !(sourceCommit ==~ /(?i)[0-9a-f]{7,40}/)) {
                                 error('SOURCE_COMMIT 必须是 7 到 40 位十六进制 Git commit')
@@ -123,14 +110,8 @@ pipeline {
                             env.RESOLVED_SOURCE_COMMIT = sourceCommit
                             env.RESOLVED_IMAGE_TAG = imageTag
                             env.RESOLVED_IMAGE_REPOSITORY = imageRepository
-                            env.DEPLOY_BOTH_EVENT_BRIDGES = deployBothBridges ? 'true' : 'false'
 
-                            if (service == 'event-bridge-service' && params.DEPLOY) {
-                                String bridgeRegion = params.EVENT_BRIDGE_REGION?.trim()
-                                if (!['BOTH', 'SELECT', 'CN', 'OVERSEAS'].contains(bridgeRegion)) {
-                                    error('EVENT_BRIDGE_REGION 只能为 BOTH、CN 或 OVERSEAS')
-                                }
-                            }
+
                         }
 
                         sh '''
@@ -142,15 +123,6 @@ pipeline {
                             test "$(git rev-parse HEAD)" = "$(git rev-parse "${RESOLVED_SOURCE_COMMIT}^{commit}")"
                         '''
 
-                        sh '''
-                            if [ "${RESOLVED_ENVIRONMENT}" = "production" ]; then
-                              git fetch --no-tags origin +refs/heads/main:refs/remotes/origin/main
-                              git merge-base --is-ancestor "${RESOLVED_SOURCE_COMMIT}" origin/main || {
-                                echo "生产构建只允许已经合并到 main 的提交" >&2
-                                exit 1
-                              }
-                            fi
-                        '''
 
                         script {
                             currentBuild.description = "${env.RESOLVED_SERVICE} | ${env.RESOLVED_IMAGE_TAG} | ${env.RESOLVED_ENVIRONMENT} | ${env.NODE_NAME}"
@@ -163,15 +135,11 @@ pipeline {
                     steps {
                         script {
                             boolean coordinatorPinnedCommit = params.SOURCE_COMMIT?.trim() as boolean
-                            if (env.RESOLVED_ENVIRONMENT == 'production' && params.SKIP_TESTS && !coordinatorPinnedCommit) {
-                                error('生产环境手工构建禁止跳过测试；总控流水线可在统一测试通过后执行快速打包')
-                            }
-                            boolean skipTestExecution = env.RESOLVED_ENVIRONMENT == 'test' || params.SKIP_TESTS
+
+                            boolean skipTestExecution = params.SKIP_TESTS
                             String testOption = skipTestExecution ? '-DskipTests' : ''
                             if (params.SKIP_TESTS && coordinatorPinnedCommit) {
                                 echo "总控已处理提交 ${env.RESOLVED_SOURCE_COMMIT} 的测试门禁，本单服务仅编译测试源码并打包"
-                            } else if (env.RESOLVED_ENVIRONMENT == 'test') {
-                                echo '测试环境快速部署：编译主代码和测试代码，但不重复执行单元测试；完整测试由提交门禁和预发布执行'
                             }
                             sh "mvn --settings ${env.MAVEN_SETTINGS} --batch-mode --errors -pl ${env.RESOLVED_SERVICE} -am clean package ${testOption}"
                         }
@@ -216,105 +184,27 @@ pipeline {
             }
         }
 
-        stage('部署开发或测试环境') {
-            when {
-                beforeAgent true
-                expression { params.DEPLOY && ['development', 'test'].contains(env.RESOLVED_ENVIRONMENT) }
-            }
+        stage('部署 TEST') {
+            when { expression { params.DEPLOY } }
             agent none
             steps {
                 script {
-                    String deploySlotLabel = "firstleg-${env.RESOLVED_ENVIRONMENT}-deploy-slot"
-                    String serviceDeployResource = "firstleg-${env.RESOLVED_ENVIRONMENT}-${env.RESOLVED_SERVICE}-deploy"
-                    String credentialId = "firstleg-${env.RESOLVED_ENVIRONMENT}-env"
-                    String targetLabel = env.RESOLVED_ENVIRONMENT == 'development' ? 'java-dev' : 'java-test'
-                    // 不同服务可以并行，但同一环境的同一服务只能有一个任务更新容器。
-                    // resource 未预配置时 Lockable Resources 会创建仅在构建期间存在的临时资源。
-                    lock(resource: serviceDeployResource, inversePrecedence: true) {
-                        lock(label: deploySlotLabel, quantity: 1, inversePrecedence: true) {
-                            node(targetLabel) {
-                                deleteDir()
-                                try {
-                                    unstash 'deployment-files'
-                                    echo "在目标节点 ${env.NODE_NAME} 本机部署到 ${env.RESOLVED_ENVIRONMENT}"
-                                    List bridgeRegions = (env.RESOLVED_SERVICE == 'event-bridge-service' &&
-                                        (env.DEPLOY_BOTH_EVENT_BRIDGES == 'true' ||
-                                            ['BOTH', 'SELECT'].contains(params.EVENT_BRIDGE_REGION)))
-                                        ? ['CN', 'OVERSEAS']
-                                        : [params.EVENT_BRIDGE_REGION]
-                                    withCredentials([
-                                        file(credentialsId: credentialId, variable: 'DEPLOY_ENV_FILE'),
-                                        usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS,
-                                            usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')
-                                    ]) {
-                                        bridgeRegions.each { bridgeRegion ->
-                                            if (env.RESOLVED_SERVICE == 'event-bridge-service') {
-                                                echo "部署事件桥实例: ${bridgeRegion}"
-                                            }
-                                            withEnv([
-                                                'TARGET_IS_LOCAL=true',
-                                                "EVENT_BRIDGE_REGION_OVERRIDE=${bridgeRegion}"
-                                            ]) {
-                                                sh "sh deploy/scripts/deploy-built-service.sh '${env.RESOLVED_ENVIRONMENT}' '${env.RESOLVED_IMAGE_REPOSITORY}' '${env.RESOLVED_IMAGE_TAG}' '${env.RESOLVED_SERVICE}' \"\$DEPLOY_ENV_FILE\""
-                                            }
-                                        }
-                                    }
-                                } finally {
-                                    cleanWs(deleteDirs: true, notFailBuild: true)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        stage('部署生产环境单个服务') {
-            when {
-                beforeAgent true
-                expression { params.DEPLOY && env.RESOLVED_ENVIRONMENT == 'production' }
-            }
-            agent { label 'java-builder' }
-            steps {
-                deleteDir()
-                unstash 'deployment-files'
-                script {
-                    String credentialId = "firstleg-${env.RESOLVED_ENVIRONMENT}-env"
-                    String serviceDeployResource = "firstleg-production-${env.RESOLVED_SERVICE}-deploy"
-                    List bridgeRegions = (env.RESOLVED_SERVICE == 'event-bridge-service' &&
-                        (env.DEPLOY_BOTH_EVENT_BRIDGES == 'true' ||
-                            ['BOTH', 'SELECT'].contains(params.EVENT_BRIDGE_REGION)))
-                        ? ['CN', 'OVERSEAS']
-                        : [params.EVENT_BRIDGE_REGION]
-                    lock(resource: serviceDeployResource, inversePrecedence: true) {
+                    lock(resource: "firstleg-test-${env.RESOLVED_SERVICE}-deploy", inversePrecedence: true) {
+                      node('java-test') {
+                        deleteDir()
+                        unstash 'deployment-files'
                         withCredentials([
-                            file(credentialsId: credentialId, variable: 'DEPLOY_ENV_FILE'),
-                            usernamePassword(credentialsId: 'gitea-production-pull-token', usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD'),
-                            sshUserPrivateKey(credentialsId: 'firstleg-production-ssh', keyFileVariable: 'TARGET_SSH_KEY', usernameVariable: 'TARGET_SSH_USER'),
-                            string(credentialsId: 'firstleg-production-host', variable: 'TARGET_SSH_HOST'),
-                            file(credentialsId: 'firstleg-production-known-hosts', variable: 'TARGET_SSH_KNOWN_HOSTS')
+                            file(credentialsId: 'firstleg-test-env', variable: 'DEPLOY_ENV_FILE'),
+                            usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')
                         ]) {
-                            bridgeRegions.each { bridgeRegion ->
-                                if (env.RESOLVED_SERVICE == 'event-bridge-service') {
-                                    echo "部署生产事件桥实例: ${bridgeRegion}"
-                                }
-                                withEnv([
-                                    'TARGET_DEPLOY_DIR=/data/firstleg/deploy/services',
-                                    'TARGET_SSH_TARGET=' + env.TARGET_SSH_USER + '@' + env.TARGET_SSH_HOST,
-                                    "EVENT_BRIDGE_REGION_OVERRIDE=${bridgeRegion}"
-                                ]) {
-                                    sh "sh deploy/scripts/deploy-built-service.sh '${env.RESOLVED_ENVIRONMENT}' '${env.RESOLVED_IMAGE_REPOSITORY}' '${env.RESOLVED_IMAGE_TAG}' '${env.RESOLVED_SERVICE}' \"\$DEPLOY_ENV_FILE\""
-                                }
+                            withEnv(['TARGET_IS_LOCAL=true', "ALLOW_SAME_CONTRACT_ROLLBACK=${params.ALLOW_SAME_CONTRACT_ROLLBACK}"]) {
+                                sh 'sh deploy/scripts/deploy-built-service.sh test "$RESOLVED_IMAGE_REPOSITORY" "$RESOLVED_IMAGE_TAG" "$RESOLVED_SERVICE" "$DEPLOY_ENV_FILE"'
                             }
                         }
+                      }
                     }
                 }
             }
-            post {
-                always {
-                    cleanWs(deleteDirs: true, notFailBuild: true)
-                }
-            }
         }
     }