diff --git a/Jenkinsfile b/Jenkinsfile index bd4d1c55b..46630542b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,20 +3,6 @@ def serviceModules = [ 'integration-service', 'event-bridge-service', 'audit-service' ] -def serviceJars = [ - 'gateway': 'gateway/target/gateway-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', - 'order': 'order/target/order-service-1.0.0-SNAPSHOT.jar', - 'warehouse': 'warehouse/target/warehouse-service-1.0.0-SNAPSHOT.jar', - 'file': 'file/target/file-service-1.0.0-SNAPSHOT.jar', - 'print': 'print/target/print-service-1.0.0-SNAPSHOT.jar', - 'integration-service': 'integration-service/target/integration-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 serviceCheckboxes = [ 'gateway': 'SERVICE_GATEWAY', 'auth': 'SERVICE_AUTH', @@ -33,17 +19,15 @@ def serviceCheckboxes = [ def commonPaths = [ 'pom.xml', 'platform-bom/', 'common-core/', 'common-web/', 'common-security/', - 'common-openapi/', 'common-audit/', 'common-event-contract/', 'Jenkinsfile', 'deploy/' + 'common-openapi/', 'common-audit/', 'common-event-contract/', 'Jenkinsfile', + 'Jenkinsfile.service', 'deploy/' ] -pipeline { - // 测试阶段使用当前任意可用节点，避免因节点未配置 docker-java17 标签而一直排队。 - // 正式环境配置好专用构建节点后，可恢复为：agent { label 'docker-java17' } - agent any +def downstreamResults = [:] - tools { - maven 'maven-3.8.8' - } +pipeline { + // 总控流水线只识别变更并调度独立的服务 Job；实际 Maven、镜像和部署在 Jenkinsfile.service 中完成。 + agent any options { disableConcurrentBuilds() @@ -65,17 +49,12 @@ pipeline { booleanParam(name: 'SERVICE_EVENT_BRIDGE', defaultValue: false, description: '跨区域事件桥（event-bridge-service）') booleanParam(name: 'SERVICE_AUDIT', defaultValue: false, description: '审计服务（audit-service）') choice(name: 'ENVIRONMENT', choices: ['test', 'staging', 'production'], description: '部署环境') - booleanParam(name: 'DEPLOY', defaultValue: false, description: '构建成功后是否部署') - booleanParam(name: 'INITIALIZE_TEST_DATABASE', defaultValue: false, description: '仅 test：幂等初始化 IAM、订单、仓库与往来单位表结构及仓库样例数据') + booleanParam(name: 'DEPLOY', defaultValue: false, description: '各服务构建成功后是否独立部署') + booleanParam(name: 'INITIALIZE_TEST_DATABASE', defaultValue: false, description: '仅 test：调度服务前幂等初始化测试数据库') booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: '是否跳过测试；生产构建不建议勾选') - string(name: 'IMAGE_REPOSITORY', defaultValue: '8.163.30.128:10082/java-project/baiyue-firstleg', description: '预发布/生产镜像仓库地址；test 环境自动使用本机镜像，无需修改') - string(name: 'DOCKER_BASE_IMAGE', defaultValue: 'docker.m.daocloud.io/library/eclipse-temurin:17-jre-alpine', description: 'Java 17 基础镜像；默认使用国内镜像代理') - } - - environment { - REGISTRY_CREDENTIALS = 'gitea-test-token' - MAVEN_SETTINGS = 'deploy/maven/settings-cn.xml' - MAVEN_OPTS = '-Dfile.encoding=UTF-8 -Dmaven.wagon.http.retryHandler.count=3' + string(name: 'IMAGE_REPOSITORY', defaultValue: '8.163.30.128:10082/java-project/baiyue-firstleg', description: '预发布/生产镜像仓库地址；test 环境自动使用本机镜像') + string(name: 'DOCKER_BASE_IMAGE', defaultValue: 'docker.m.daocloud.io/library/eclipse-temurin:17-jre-alpine', description: 'Java 17 基础镜像') + string(name: 'DOWNSTREAM_JOB_PREFIX', defaultValue: 'baiyue-firstleg-', description: '单服务 Jenkins Job 名称前缀，例如 baiyue-firstleg-auth') } stages { @@ -89,7 +68,7 @@ pipeline { } else { requestedRepository = params.IMAGE_REPOSITORY?.trim() if (!requestedRepository || requestedRepository == 'registry.example.com/your-group/baiyue-firstleg') { - error('预发布/生产环境必须填写真实的 HTTPS 镜像仓库地址') + error('预发布/生产环境必须填写真实镜像仓库地址') } if (requestedRepository.contains('://') || !requestedRepository.contains('/')) { error('IMAGE_REPOSITORY 格式错误：请填写 host[:port]/owner/image，不要包含 http:// 或 https://') @@ -97,6 +76,12 @@ pipeline { } env.RESOLVED_IMAGE_REPOSITORY = requestedRepository + String jobPrefix = params.DOWNSTREAM_JOB_PREFIX?.trim() + if (!jobPrefix) { + error('DOWNSTREAM_JOB_PREFIX 不能为空') + } + env.RESOLVED_JOB_PREFIX = jobPrefix + List selected = [] if (params.BUILD_MODE == 'ALL') { selected = serviceModules @@ -114,7 +99,9 @@ pipeline { } else { List changed = sh(script: "git diff --name-only ${base} HEAD", returnStdout: true) .trim().split('\\n').collect { it.trim() }.findAll { it } - boolean commonChanged = changed.any { path -> commonPaths.any { prefix -> path == prefix || path.startsWith(prefix) } } + boolean commonChanged = changed.any { path -> + commonPaths.any { prefix -> path == prefix || path.startsWith(prefix) } + } selected = commonChanged ? serviceModules : serviceModules.findAll { module -> changed.any { it == module || it.startsWith("${module}/") } } @@ -125,60 +112,17 @@ pipeline { if (invalid) { error("未知服务: ${invalid.join(', ')}；允许值: ${serviceModules.join(', ')}") } + selected = selected.unique() + env.SELECTED_SERVICES = selected.join(',') + env.NO_SERVICE_CHANGE = selected ? 'false' : 'true' if (!selected) { currentBuild.description = '没有需要构建的业务服务' - env.NO_SERVICE_CHANGE = 'true' - env.SELECTED_SERVICES = '' } else { - env.NO_SERVICE_CHANGE = 'false' - env.SELECTED_SERVICES = selected.join(',') + env.SOURCE_COMMIT = sh(script: 'git rev-parse HEAD', returnStdout: true).trim() env.IMAGE_TAG = sh(script: 'git rev-parse --short=12 HEAD', returnStdout: true).trim() currentBuild.description = "${env.SELECTED_SERVICES} | ${env.IMAGE_TAG}" - echo "本次构建服务: ${env.SELECTED_SERVICES}" - } - } - } - } - - stage('Maven 测试与打包') { - when { expression { env.NO_SERVICE_CHANGE != 'true' } } - steps { - script { - String testOption = params.SKIP_TESTS ? '-DskipTests' : '' - sh "mvn --settings ${env.MAVEN_SETTINGS} --batch-mode --errors --fail-at-end -pl ${env.SELECTED_SERVICES} -am clean package ${testOption}" - } - } - post { - always { - junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml' - } - } - } - - stage('构建镜像并按环境发布') { - when { expression { env.NO_SERVICE_CHANGE != 'true' } } - steps { - script { - env.SELECTED_SERVICES.split(',').each { service -> - String image = "${env.RESOLVED_IMAGE_REPOSITORY}/${service}:${env.IMAGE_TAG}" - String contextDir = ".docker-context/${service}" - sh "mkdir -p '${contextDir}' && cp -f '${serviceJars[service]}' '${contextDir}/app.jar'" - sh "docker build -f deploy/docker/Dockerfile --build-arg BASE_IMAGE=${params.DOCKER_BASE_IMAGE} --build-arg JAR_FILE=app.jar -t ${image} '${contextDir}'" - } - - if (params.ENVIRONMENT == 'test') { - echo "测试镜像已保存在当前 Docker 节点：${env.RESOLVED_IMAGE_REPOSITORY}/*:${env.IMAGE_TAG}" - } else { - String registryHost = env.RESOLVED_IMAGE_REPOSITORY.tokenize('/')[0] - withCredentials([usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')]) { - sh 'printf %s "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin "' + registryHost + '"' - env.SELECTED_SERVICES.split(',').each { service -> - String image = "${env.RESOLVED_IMAGE_REPOSITORY}/${service}:${env.IMAGE_TAG}" - sh "docker push ${image}" - } - sh "docker logout ${registryHost} || true" - } + echo "本次独立调度服务: ${env.SELECTED_SERVICES}" } } } @@ -191,7 +135,7 @@ pipeline { } } steps { - input message: "确认将 ${env.SELECTED_SERVICES} 的镜像 ${env.IMAGE_TAG} 部署到生产环境？", ok: '确认部署' + input message: "确认将 ${env.SELECTED_SERVICES} 的镜像 ${env.IMAGE_TAG} 分别部署到生产环境？", ok: '确认部署' } } @@ -206,17 +150,51 @@ pipeline { } } - stage('部署') { - when { - allOf { - expression { params.DEPLOY && env.NO_SERVICE_CHANGE != 'true' } - } - } + stage('并行调度独立服务 Job') { + when { expression { env.NO_SERVICE_CHANGE != 'true' } } steps { script { - String credentialId = "firstleg-${params.ENVIRONMENT}-env" - withCredentials([file(credentialsId: credentialId, variable: 'DEPLOY_ENV_FILE')]) { - sh "sh deploy/scripts/deploy-services.sh '${params.ENVIRONMENT}' '${env.RESOLVED_IMAGE_REPOSITORY}' '${env.IMAGE_TAG}' '${env.SELECTED_SERVICES}' \"\$DEPLOY_ENV_FILE\"" + Map branches = [:] + env.SELECTED_SERVICES.split(',').each { selectedService -> + String service = selectedService + branches[service] = { + String jobName = "${env.RESOLVED_JOB_PREFIX}${service}" + echo "触发单服务 Job: ${jobName}" + def downstreamBuild = build( + job: jobName, + wait: true, + propagate: false, + parameters: [ + string(name: 'SERVICE', value: service), + string(name: 'SOURCE_COMMIT', value: env.SOURCE_COMMIT), + string(name: 'IMAGE_TAG', value: env.IMAGE_TAG), + string(name: 'ENVIRONMENT', value: params.ENVIRONMENT), + booleanParam(name: 'DEPLOY', value: params.DEPLOY), + booleanParam(name: 'SKIP_TESTS', value: params.SKIP_TESTS), + string(name: 'IMAGE_REPOSITORY', value: env.RESOLVED_IMAGE_REPOSITORY), + string(name: 'DOCKER_BASE_IMAGE', value: params.DOCKER_BASE_IMAGE) + ] + ) + downstreamResults[service] = downstreamBuild.result ?: 'UNKNOWN' + echo "${service} 执行结果: ${downstreamResults[service]} (${downstreamBuild.absoluteUrl})" + } + } + parallel branches + } + } + } + + stage('汇总服务结果') { + when { expression { env.NO_SERVICE_CHANGE != 'true' } } + steps { + script { + List failed = downstreamResults.findAll { service, result -> result != 'SUCCESS' } + .collect { service, result -> "${service}=${result}" } + String summary = downstreamResults.collect { service, result -> "${service}=${result}" }.join(', ') + echo "单服务执行汇总: ${summary}" + currentBuild.description = "${env.IMAGE_TAG} | ${summary}" + if (failed) { + unstable("部分服务执行失败，但其他服务已独立完成：${failed.join(', ')}") } } } diff --git a/Jenkinsfile.service b/Jenkinsfile.service new file mode 100644 index 000000000..d4a72a209 --- /dev/null +++ b/Jenkinsfile.service @@ -0,0 +1,161 @@ +def serviceModules = [ + 'gateway', 'auth', 'iam', 'firstleg', 'order', 'warehouse', 'file', 'print', + 'integration-service', 'event-bridge-service', 'audit-service' +] + +def serviceJars = [ + 'gateway': 'gateway/target/gateway-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', + 'order': 'order/target/order-service-1.0.0-SNAPSHOT.jar', + 'warehouse': 'warehouse/target/warehouse-service-1.0.0-SNAPSHOT.jar', + 'file': 'file/target/file-service-1.0.0-SNAPSHOT.jar', + 'print': 'print/target/print-service-1.0.0-SNAPSHOT.jar', + 'integration-service': 'integration-service/target/integration-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' +] + +pipeline { + // 每个 Jenkins 子 Job 使用自己的 workspace，因此不同服务可以并行执行 mvn clean。 + agent any + + tools { + maven 'maven-3.8.8' + } + + options { + skipDefaultCheckout(true) + disableConcurrentBuilds() + timestamps() + buildDiscarder(logRotator(numToKeepStr: '30')) + } + + parameters { + choice(name: 'SERVICE', choices: serviceModules, description: '本 Job 负责构建和部署的单个服务') + string(name: 'SOURCE_COMMIT', defaultValue: '', description: '必须构建的 Git commit；通常由总控 Job 传入') + string(name: 'IMAGE_TAG', defaultValue: '', description: '不可变镜像标签；通常使用 Git commit 前 12 位') + choice(name: 'ENVIRONMENT', choices: ['test', 'staging', 'production'], description: '部署环境') + booleanParam(name: 'DEPLOY', defaultValue: false, description: '构建成功后是否部署本服务') + booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: '是否跳过测试') + string(name: 'IMAGE_REPOSITORY', defaultValue: 'baiyue-firstleg-test', description: '镜像仓库基础路径，不包含服务名和标签') + string(name: 'DOCKER_BASE_IMAGE', defaultValue: 'docker.m.daocloud.io/library/eclipse-temurin:17-jre-alpine', description: 'Java 17 基础镜像') + } + + environment { + REGISTRY_CREDENTIALS = 'gitea-test-token' + MAVEN_SETTINGS = 'deploy/maven/settings-cn.xml' + MAVEN_OPTS = '-Dfile.encoding=UTF-8 -Dmaven.wagon.http.retryHandler.count=3' + } + + stages { + stage('校验参数并检出指定提交') { + steps { + script { + String service = params.SERVICE?.trim() + String sourceCommit = params.SOURCE_COMMIT?.trim() + String imageTag = params.IMAGE_TAG?.trim() + String imageRepository = params.IMAGE_REPOSITORY?.trim() + + if (!serviceModules.contains(service)) { + error("未知服务: ${service}；允许值: ${serviceModules.join(', ')}") + } + if (!sourceCommit || !(sourceCommit ==~ /(?i)[0-9a-f]{7,40}/)) { + error('SOURCE_COMMIT 必须是 7 到 40 位十六进制 Git commit') + } + if (!imageTag || !(imageTag ==~ /[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}/)) { + error('IMAGE_TAG 不是合法的 Docker 镜像标签') + } + if (!imageRepository || imageRepository.contains('://')) { + error('IMAGE_REPOSITORY 不能为空且不能包含 http:// 或 https://') + } + if (params.ENVIRONMENT != 'test' && !imageRepository.contains('/')) { + error('预发布/生产环境 IMAGE_REPOSITORY 必须使用 host[:port]/owner/image 格式') + } + + env.RESOLVED_SERVICE = service + env.RESOLVED_SOURCE_COMMIT = sourceCommit + env.RESOLVED_IMAGE_TAG = imageTag + env.RESOLVED_IMAGE_REPOSITORY = imageRepository + } + + checkout scm + sh ''' + if ! git cat-file -e "${RESOLVED_SOURCE_COMMIT}^{commit}" 2>/dev/null; then + git fetch --no-tags origin + fi + git cat-file -e "${RESOLVED_SOURCE_COMMIT}^{commit}" + git checkout --detach "${RESOLVED_SOURCE_COMMIT}" + test "$(git rev-parse HEAD)" = "$(git rev-parse "${RESOLVED_SOURCE_COMMIT}^{commit}")" + ''' + + script { + currentBuild.description = "${env.RESOLVED_SERVICE} | ${env.RESOLVED_IMAGE_TAG} | ${params.ENVIRONMENT}" + echo "独立构建服务: ${env.RESOLVED_SERVICE}，提交: ${env.RESOLVED_SOURCE_COMMIT}" + } + } + } + + stage('Maven 测试与打包') { + steps { + script { + String testOption = params.SKIP_TESTS ? '-DskipTests' : '' + sh "mvn --settings ${env.MAVEN_SETTINGS} --batch-mode --errors -pl ${env.RESOLVED_SERVICE} -am clean package ${testOption}" + } + } + post { + always { + junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml' + } + } + } + + stage('构建并发布单服务镜像') { + steps { + script { + String image = "${env.RESOLVED_IMAGE_REPOSITORY}/${env.RESOLVED_SERVICE}:${env.RESOLVED_IMAGE_TAG}" + String contextDir = ".docker-context/${env.RESOLVED_SERVICE}" + String jar = serviceJars[env.RESOLVED_SERVICE] + sh "mkdir -p '${contextDir}' && cp -f '${jar}' '${contextDir}/app.jar'" + sh "docker build -f deploy/docker/Dockerfile --build-arg BASE_IMAGE=${params.DOCKER_BASE_IMAGE} --build-arg JAR_FILE=app.jar -t ${image} '${contextDir}'" + + if (params.ENVIRONMENT == 'test') { + echo "测试镜像已保存在当前 Docker 节点：${image}" + } else { + String registryHost = env.RESOLVED_IMAGE_REPOSITORY.tokenize('/')[0] + withCredentials([usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')]) { + try { + sh 'printf %s "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin "' + registryHost + '"' + sh "docker push ${image}" + } finally { + sh "docker logout ${registryHost} || true" + } + } + } + } + } + } + + stage('部署单个服务') { + when { expression { params.DEPLOY } } + steps { + script { + String credentialId = "firstleg-${params.ENVIRONMENT}-env" + withCredentials([file(credentialsId: credentialId, variable: 'DEPLOY_ENV_FILE')]) { + sh "sh deploy/scripts/deploy-services.sh '${params.ENVIRONMENT}' '${env.RESOLVED_IMAGE_REPOSITORY}' '${env.RESOLVED_IMAGE_TAG}' '${env.RESOLVED_SERVICE}' \"\$DEPLOY_ENV_FILE\"" + } + } + } + } + } + + post { + success { + echo "${env.RESOLVED_SERVICE} 已独立完成构建${params.DEPLOY ? '和部署' : ''}" + } + always { + cleanWs(deleteDirs: true, notFailBuild: true) + } + } +}