From 6b900c4e3653ad45c2f90c452524af593378645a Mon Sep 17 00:00:00 2001 From: dxin Date: Mon, 20 Oct 2025 19:42:34 +0800 Subject: [PATCH] +1 --- SCM/build_image_flymoon_agent.groovy | 169 ++++++++++++++++++++++ SCM/build_image_flymoon_payment.groovy | 169 ++++++++++++++++++++++ SCM/build_image_lessie_agents_test.groovy | 11 +- SCM/lessie_sourcing_agents.groovy | 37 ----- python/tmp.groovy | 20 ++- 多分支集成.groovy | 44 ++++++ 6 files changed, 401 insertions(+), 49 deletions(-) create mode 100644 SCM/build_image_flymoon_agent.groovy create mode 100644 SCM/build_image_flymoon_payment.groovy delete mode 100644 SCM/lessie_sourcing_agents.groovy create mode 100644 多分支集成.groovy diff --git a/SCM/build_image_flymoon_agent.groovy b/SCM/build_image_flymoon_agent.groovy new file mode 100644 index 0000000..2ed1ac2 --- /dev/null +++ b/SCM/build_image_flymoon_agent.groovy @@ -0,0 +1,169 @@ +pipeline { + agent any + tools{ + maven 'mvn3.8.8' + jdk 'jdk21' + } + parameters { + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'Code_branch', + type: 'PT_BRANCH', + selectedValue: 'DEFAULT', + sortMode: 'NONE', + description: '选择代码分支: ', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + choice( + name: 'BUILD_env', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置：' + ) + } + environment { + REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 + NAMESPACE = "lessie${params.BUILD_env}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "flymoon-agent" // 镜像名（固定前缀） + CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + } + + stages { + stage('拉取代码') { + steps { + git branch: "${params.Code_branch}", credentialsId: 'fly_gitlab_auth', url: 'http://106.53.194.199/root/fly_moon_agent.git' + } + } + + stage('获取信息') { + steps { + script { + // 获取最近一次提交的哈希值（短格式，前8位） + env.GIT_COMMIT_SHORT = sh(script: 'git rev-parse --short HEAD',returnStdout: true).trim() + // 获取最近一次提交的作者 + env.GIT_AUTHOR = sh(script: 'git log -1 --pretty=format:%an',returnStdout: true).trim() + // 获取最近一次提交的时间（格式化） + env.GIT_COMMIT_TIME = sh( + script: 'git log -1 --pretty=format:%ct | xargs -I {} date -d @{} +%Y%m%d-%H%M%S', + returnStdout: true + ).trim() + // 获取最近一次提交的备注信息（转义特殊字符，避免构建失败） + env.GIT_COMMIT_MSG = sh(script: 'git log -1 --pretty=format:%s | sed -e \'s/"/\\"/g\'', returnStdout: true).trim() + // Jenkins构建次数 + def buildNumber = env.BUILD_NUMBER // Jenkins内置变量，直接获取当前Job的构建序号 + // 当前分支名（处理/为-，如feature/docker_1015 → feature-docker_1015） + def branchName = sh(script: 'git rev-parse --abbrev-ref HEAD', returnStdout: true).trim() + def formattedBranch = branchName.replace('/', '-').replace('_', '-') // 替换分支名中的/和_为- + // 构建时间（格式：202510181215，年-月-日-时-分，无分隔符） + def buildTime = sh(script: 'date +%Y%m%d%H%M', returnStdout: true).trim() + // 最终Tag（格式：v+构建次数_分支名_短哈希_构建时间） + env.IMAGE_TAG = "v${buildNumber}_${formattedBranch}_${GIT_COMMIT_SHORT}_${buildTime}" + } + } + } + + stage('Maven 编译') { + steps { + sh "cd ${WORKSPACE}/ && mvn clean install -P ${params.BUILD_env} -Dmaven.test.skip=true" + } + } + + stage('登录容器仓库') { + steps { + withCredentials([usernamePassword( + credentialsId: env.CREDENTIALS_ID, + usernameVariable: 'REGISTRY_USER', + passwordVariable: 'REGISTRY_PWD' + )]) { + sh ''' + echo "$REGISTRY_PWD" | docker login ${REGISTRY} -u ${REGISTRY_USER} --password-stdin + ''' + } + } + } + + stage('构建容器镜像') { + steps { + script { + // 构建镜像，添加标签信息 + sh """ + docker build --build-arg BUILD_PROFILE=${params.BUILD_env} \ + -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ + --label "git-branch='${params.Code_branch}'" \ + --label "git-commit='${GIT_COMMIT_SHORT}'" \ + --label "git-author='${GIT_AUTHOR}'" \ + --label "git-message='${GIT_COMMIT_MSG}'" \ + --label "build-time='${GIT_COMMIT_TIME}'" \ + . + """ + } + } + } + + stage('推送镜像到仓库') { + steps { + script { + // 推送主镜像（带唯一 Tag） + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + + // 推送 latest 标签（包含命名空间） + sh "docker tag ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + } + } + } + } + + post { + always { + script { + echo "开始清理本地旧镜像，仅保留最近 3 个构建版本 + latest" + // 保留镜像数量 + def keepCount = 3 + def imagePrefix = "${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}" + // 获取当前镜像的 IMAGE ID + def currentImageId = sh(script: "docker images -q ${imagePrefix}:${IMAGE_TAG}", returnStdout: true).trim() + // 获取所有该镜像的本地版本（按创建时间排序） + def allImages = sh(script: "docker images ${imagePrefix} --format '{{.ID}} {{.Tag}}' | sort -rk2", returnStdout: true).trim().split('\n') + if (allImages.size() > keepCount + 1) { // +1 是因为还要保留 latest + def oldImages = allImages.drop(keepCount + 1) + echo "发现 ${oldImages.size()} 个旧镜像需要清理" + + oldImages.each { line -> + def parts = line.split(' ') + def imageId = parts[0] + def tag = parts[1] + + // 跳过 latest + if (tag != "latest") { + echo "删除旧镜像: ${imagePrefix}:${tag}" + sh "docker rmi -f ${imagePrefix}:${tag} || true" + } + } + } else { + echo "当前镜像数未超过 ${keepCount + 1} 个，无需清理" + } + sh """ + echo "当前镜像状态：" + docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}\\t{{.Size}}' + """ + // 无论成败都登出，清理凭证 + sh "docker logout ${REGISTRY}" + echo "容器仓库已登出，本地凭证已清理" + } + } + success { + // 输出构建结果 + echo "镜像构建成功！" + echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + echo "latest 标签地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" + } + failure { + // 输出构建结果 + echo "镜像构建失败！" + } + } +} \ No newline at end of file diff --git a/SCM/build_image_flymoon_payment.groovy b/SCM/build_image_flymoon_payment.groovy new file mode 100644 index 0000000..6239d66 --- /dev/null +++ b/SCM/build_image_flymoon_payment.groovy @@ -0,0 +1,169 @@ +pipeline { + agent any + tools{ + maven 'mvn3.8.8' + jdk 'jdk21' + } + parameters { + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'Code_branch', + type: 'PT_BRANCH', + selectedValue: 'DEFAULT', + sortMode: 'NONE', + description: '选择代码分支: ', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + choice( + name: 'BUILD_env', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置：' + ) + } + environment { + REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 + NAMESPACE = "lessie${params.BUILD_env}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "flymoon-payment" // 镜像名（固定前缀） + CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + } + + stages { + stage('拉取代码') { + steps { + git branch: "${params.Code_branch}", credentialsId: 'fly_gitlab_auth', url: 'http://106.53.194.199/root/fly_moon_payment.git' + } + } + + stage('获取信息') { + steps { + script { + // 获取最近一次提交的哈希值（短格式，前8位） + env.GIT_COMMIT_SHORT = sh(script: 'git rev-parse --short HEAD',returnStdout: true).trim() + // 获取最近一次提交的作者 + env.GIT_AUTHOR = sh(script: 'git log -1 --pretty=format:%an',returnStdout: true).trim() + // 获取最近一次提交的时间（格式化） + env.GIT_COMMIT_TIME = sh( + script: 'git log -1 --pretty=format:%ct | xargs -I {} date -d @{} +%Y%m%d-%H%M%S', + returnStdout: true + ).trim() + // 获取最近一次提交的备注信息（转义特殊字符，避免构建失败） + env.GIT_COMMIT_MSG = sh(script: 'git log -1 --pretty=format:%s | sed -e \'s/"/\\"/g\'', returnStdout: true).trim() + // Jenkins构建次数 + def buildNumber = env.BUILD_NUMBER // Jenkins内置变量，直接获取当前Job的构建序号 + // 当前分支名（处理/为-，如feature/docker_1015 → feature-docker_1015） + def branchName = sh(script: 'git rev-parse --abbrev-ref HEAD', returnStdout: true).trim() + def formattedBranch = branchName.replace('/', '-').replace('_', '-') // 替换分支名中的/和_为- + // 构建时间（格式：202510181215，年-月-日-时-分，无分隔符） + def buildTime = sh(script: 'date +%Y%m%d%H%M', returnStdout: true).trim() + // 最终Tag（格式：v+构建次数_分支名_短哈希_构建时间） + env.IMAGE_TAG = "v${buildNumber}_${formattedBranch}_${GIT_COMMIT_SHORT}_${buildTime}" + } + } + } + + stage('Maven 编译') { + steps { + sh "cd ${WORKSPACE}/ && mvn clean install -P ${params.BUILD_env} -Dmaven.test.skip=true" + } + } + + stage('登录容器仓库') { + steps { + withCredentials([usernamePassword( + credentialsId: env.CREDENTIALS_ID, + usernameVariable: 'REGISTRY_USER', + passwordVariable: 'REGISTRY_PWD' + )]) { + sh ''' + echo "$REGISTRY_PWD" | docker login ${REGISTRY} -u ${REGISTRY_USER} --password-stdin + ''' + } + } + } + + stage('构建容器镜像') { + steps { + script { + // 构建镜像，添加标签信息 + sh """ + docker build --build-arg BUILD_PROFILE=${params.BUILD_env} \ + -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ + --label "git-branch='${params.Code_branch}'" \ + --label "git-commit='${GIT_COMMIT_SHORT}'" \ + --label "git-author='${GIT_AUTHOR}'" \ + --label "git-message='${GIT_COMMIT_MSG}'" \ + --label "build-time='${GIT_COMMIT_TIME}'" \ + . + """ + } + } + } + + stage('推送镜像到仓库') { + steps { + script { + // 推送主镜像（带唯一 Tag） + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + + // 推送 latest 标签（包含命名空间） + sh "docker tag ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + } + } + } + } + + post { + always { + script { + echo "开始清理本地旧镜像，仅保留最近 3 个构建版本 + latest" + // 保留镜像数量 + def keepCount = 3 + def imagePrefix = "${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}" + // 获取当前镜像的 IMAGE ID + def currentImageId = sh(script: "docker images -q ${imagePrefix}:${IMAGE_TAG}", returnStdout: true).trim() + // 获取所有该镜像的本地版本（按创建时间排序） + def allImages = sh(script: "docker images ${imagePrefix} --format '{{.ID}} {{.Tag}}' | sort -rk2", returnStdout: true).trim().split('\n') + if (allImages.size() > keepCount + 1) { // +1 是因为还要保留 latest + def oldImages = allImages.drop(keepCount + 1) + echo "发现 ${oldImages.size()} 个旧镜像需要清理" + + oldImages.each { line -> + def parts = line.split(' ') + def imageId = parts[0] + def tag = parts[1] + + // 跳过 latest + if (tag != "latest") { + echo "删除旧镜像: ${imagePrefix}:${tag}" + sh "docker rmi -f ${imagePrefix}:${tag} || true" + } + } + } else { + echo "当前镜像数未超过 ${keepCount + 1} 个，无需清理" + } + sh """ + echo "当前镜像状态：" + docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}\\t{{.Size}}' + """ + // 无论成败都登出，清理凭证 + sh "docker logout ${REGISTRY}" + echo "容器仓库已登出，本地凭证已清理" + } + } + success { + // 输出构建结果 + echo "镜像构建成功！" + echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + echo "latest 标签地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" + } + failure { + // 输出构建结果 + echo "镜像构建失败！" + } + } +} \ No newline at end of file diff --git a/SCM/build_image_lessie_agents_test.groovy b/SCM/build_image_lessie_agents_test.groovy index a31866a..7fee09a 100644 --- a/SCM/build_image_lessie_agents_test.groovy +++ b/SCM/build_image_lessie_agents_test.groovy @@ -80,7 +80,7 @@ pipeline { // 构建镜像，添加标签信息 sh """ docker build -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ - --label "git-branch='${params.Code_branch}'" \ + --label "git-branch='${formattedBranch}'" \ --label "git-commit='${GIT_COMMIT_SHORT}'" \ --label "git-author='${GIT_AUTHOR}'" \ --label "git-message='${GIT_COMMIT_MSG}'" \ @@ -134,8 +134,10 @@ pipeline { } else { echo "当前镜像数未超过 ${keepCount + 1} 个，无需清理" } - echo "当前镜像数：${allImages.size()}" - sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" + sh """ + echo "当前镜像状态：" + docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}\\t{{.Size}}' + """ // 无论成败都登出，清理凭证 sh "docker logout ${REGISTRY}" echo "容器仓库已登出，本地凭证已清理" @@ -151,9 +153,6 @@ pipeline { failure { // 输出构建结果 echo "镜像构建失败！" - echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - echo "latest 标签地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" - echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" } } } \ No newline at end of file diff --git a/SCM/lessie_sourcing_agents.groovy b/SCM/lessie_sourcing_agents.groovy deleted file mode 100644 index 150286c..0000000 --- a/SCM/lessie_sourcing_agents.groovy +++ /dev/null @@ -1,37 +0,0 @@ -pipeline { - agent any - stages { - stage('拉取镜像') { - steps { - script { - // 从选择的参数中提取标签（如从 "tag→分支:xxx..." 中取前半部分） - def imageTag = params.SELECTED_IMAGE.split(" → ")[0].trim() - def fullImage = "uswccr.ccs.tencentyun.com/lessietest/lessie-sourcing-agents:${imageTag}" - - // 登录仓库并拉取镜像 - withCredentials([usernamePassword( - credentialsId: 'dxin_img_hub_auth', - usernameVariable: 'USERNAME', - passwordVariable: 'PASSWORD' - )]) { - sh """ - echo "${PASSWORD}" | docker login uswccr.ccs.tencentyun.com -u ${USERNAME} --password-stdin - docker pull ${fullImage} - """ - } - } - } - } - stage('部署镜像') { - steps { - script { - def imageTag = params.SELECTED_IMAGE.split(" → ")[0].trim() - def fullImage = "uswccr.ccs.tencentyun.com/lessietest/lessie-sourcing-agents:${imageTag}" - echo "正在部署镜像：${fullImage}" - // 添加你的部署命令（如 docker run、kubectl apply 等） - // sh "docker run -d --name my-app ${fullImage}" - } - } - } - } -} \ No newline at end of file diff --git a/python/tmp.groovy b/python/tmp.groovy index a31866a..9653475 100644 --- a/python/tmp.groovy +++ b/python/tmp.groovy @@ -134,8 +134,10 @@ pipeline { } else { echo "当前镜像数未超过 ${keepCount + 1} 个，无需清理" } - echo "当前镜像数：${allImages.size()}" - sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" + sh """ + echo "当前镜像状态：" + docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}\\t{{.Size}}' + """ // 无论成败都登出，清理凭证 sh "docker logout ${REGISTRY}" echo "容器仓库已登出，本地凭证已清理" @@ -151,9 +153,15 @@ pipeline { failure { // 输出构建结果 echo "镜像构建失败！" - echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - echo "latest 标签地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" - echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" } } -} \ No newline at end of file +} + + + + + +jenkins 可以实现类似云效那种集成分支模式部署的功能吗？ +比如有一个基础分支，然后可以再选一个或者多个分支进行集成，然后形成一个新的运行分支，使用这个运行分支进行构建部署？ +例如基础分支选择了master，然后再选了dev分支(甚至再多选几个dev2分支、dev3分支)，开始部署后的逻辑是：先基于基础分支master复制出新的集成分支，名字按“feature/jenkins_2025-1020”命名，然后基于新的集成分支进行集成，集成完成后，将集成后的代码提交到新的集成分支，然后基于新的集成分支进行构建，构建完成后，将构建后的镜像推送到镜像仓库，然后可以选择是否删除新的集成分支。” + diff --git a/多分支集成.groovy b/多分支集成.groovy new file mode 100644 index 0000000..2ad1da9 --- /dev/null +++ b/多分支集成.groovy @@ -0,0 +1,44 @@ +pipeline { + agent any + + parameters { + // 单选：基础分支 + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'BASE_BRANCH', + type: 'PT_BRANCH', + selectedValue: 'DEFAULT', + sortMode: 'ASCENDING_SMART', + description: '选择基础分支', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + + // 多选：要合并的特性分支 + gitParameter( + branchFilter: 'origin/(?!master|mainsit|dxin|release).*', // 排除主干分支，只显示特性分支 + name: 'MERGE_BRANCHES', + type: 'PT_MULTI_BRANCH', + description: '选择要集成的特性分支', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + + booleanParam(name: 'DELETE_INTEGRATION_BRANCH', defaultValue: true, description: '构建完成后删除临时分支？') + } + + + stages { + stage('拉取基础分支') { + steps { + // 拉取指定分支代码（通过参数 params.Code_branch 动态指定） + git branch: "${params.BASE_BRANCH}", + credentialsId: 'fly_gitlab_auth', + url: 'http://106.53.194.199/python/lessie-sourcing-agents.git' + } + } + } +} \ No newline at end of file