diff --git a/SCM/build_image_lessie_agents_test.groovy b/SCM/build_image_lessie_agents_test.groovy index 2c2e421..a31866a 100644 --- a/SCM/build_image_lessie_agents_test.groovy +++ b/SCM/build_image_lessie_agents_test.groovy @@ -100,9 +100,6 @@ pipeline { // 推送 latest 标签(包含命名空间) sh "docker tag ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" - - // 登出仓库 - sh "docker logout ${REGISTRY}" } } } @@ -110,42 +107,43 @@ pipeline { post { always { - 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()} 个旧镜像需要清理" + 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] + 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" + // 跳过 latest + if (tag != "latest") { + echo "删除旧镜像: ${imagePrefix}:${tag}" + sh "docker rmi -f ${imagePrefix}:${tag} || true" + } } + } else { + echo "当前镜像数未超过 ${keepCount + 1} 个,无需清理" } - } else { - echo "当前镜像数未超过 ${keepCount + 1} 个,无需清理" + echo "当前镜像数:${allImages.size()}" + sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" + // 无论成败都登出,清理凭证 + sh "docker logout ${REGISTRY}" + echo "容器仓库已登出,本地凭证已清理" } - - - // 无论成败都登出,清理凭证 - sh "docker logout ${REGISTRY}" - echo "容器仓库已登出,本地凭证已清理" } success { // 输出构建结果 echo "镜像构建成功!" - sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" echo "镜像地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" echo "latest 标签地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" echo "对应代码提交:${GIT_COMMIT_SHORT}(${GIT_COMMIT_MSG})" @@ -153,7 +151,6 @@ pipeline { failure { // 输出构建结果 echo "镜像构建失败!" - sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" echo "镜像地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" echo "latest 标签地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" echo "对应代码提交:${GIT_COMMIT_SHORT}(${GIT_COMMIT_MSG})" diff --git a/python/tmp.groovy b/python/tmp.groovy index 52ee2aa..a31866a 100644 --- a/python/tmp.groovy +++ b/python/tmp.groovy @@ -100,9 +100,6 @@ pipeline { // 推送 latest 标签(包含命名空间) sh "docker tag ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" - - // 登出仓库 - sh "docker logout ${REGISTRY}" } } } @@ -110,35 +107,39 @@ pipeline { post { always { - // 1. 登出仓库(不变) - sh "docker logout ${REGISTRY}" - echo "容器仓库已登出,本地凭证已清理" + 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()} 个旧镜像需要清理" - // 2. 兼容低版本 Docker 的镜像清理脚本 - sh ''' - TARGET_IMAGE="uswccr.ccs.tencentyun.com/lessietest/lessie-sourcing-agents" - ALL_TAGS_WITH_TIME=$(docker images --format "{{.CreatedAt}} {{.Repository}}:{{.Tag}}" --filter "reference=${TARGET_IMAGE}:*") - ALL_TAGS=$(echo "${ALL_TAGS_WITH_TIME}" | sort -k1,1r | awk '{print $2}') - TAGS_TO_DELETE=$(echo "${ALL_TAGS}" | tail -n +2) - if [ -n "${TAGS_TO_DELETE}" ]; then - echo "开始删除冗余镜像:" - echo "${TAGS_TO_DELETE}" - for TAG in ${TAGS_TO_DELETE}; do - CONTAINERS=$(docker ps -a --filter "ancestor=${TAG}" --format "{{.ID}}") - if [ -n "${CONTAINERS}" ]; then - echo "停止并删除引用镜像 ${TAG} 的容器:${CONTAINERS}" - docker stop ${CONTAINERS} > /dev/null 2>&1 - docker rm ${CONTAINERS} > /dev/null 2>&1 - fi - echo "删除镜像:${TAG}" - docker rmi -f ${TAG} > /dev/null 2>&1 - done - echo "冗余镜像删除完成" - else - echo "无冗余镜像可删除(仅保留了最新的1个镜像)" - fi - ''' - echo "本地镜像清理完成,核心缓存层已保留" + 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} 个,无需清理" + } + echo "当前镜像数:${allImages.size()}" + sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" + // 无论成败都登出,清理凭证 + sh "docker logout ${REGISTRY}" + echo "容器仓库已登出,本地凭证已清理" + } } success { // 输出构建结果 @@ -147,5 +148,12 @@ pipeline { echo "latest 标签地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" echo "对应代码提交:${GIT_COMMIT_SHORT}(${GIT_COMMIT_MSG})" } + 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/python/us_prod_flymoon_api_monitor.pipeline b/python/us_prod_flymoon_api_monitor.pipeline index 2c2e421..d5903c1 100644 --- a/python/us_prod_flymoon_api_monitor.pipeline +++ b/python/us_prod_flymoon_api_monitor.pipeline @@ -1,162 +1,64 @@ pipeline { agent any - parameters { - gitParameter( - branchFilter: 'origin/(.*)', - defaultValue: 'master', - name: 'Code_branch', - type: 'PT_BRANCH', - selectedValue: 'DEFAULT', - sortMode: 'NONE', - description: '选择代码分支,默认master分支', - quickFilterEnabled: true, - tagFilter: '*', - listSize: "1" - ) - } - environment { - REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 - NAMESPACE = "lessietest" // 命名空间 - IMAGE_NAME = "lessie-sourcing-agents" // 镜像名(固定前缀) - CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + REMOTE_HOST = "43.159.145.241" // 远程服务器 + REMOTE_PROJECT_PATH = "/data/webapps/fly_moon_bigdata" + VENV_DIR = "/data/webapps/fly_moon_bigdata/venv" + CONDA_PATH = "/root/miniconda3/bin/conda" } stages { - stage('拉取代码') { + stage('Checkout 代码') { steps { - // 拉取指定分支代码(通过参数 params.Code_branch 动态指定) - git branch: "${params.Code_branch}", - credentialsId: 'fly_gitlab_auth', - url: 'http://106.53.194.199/python/lessie-sourcing-agents.git' + git branch: "${params.Code_branch}", credentialsId: 'fly_gitlab_auth', url: 'http://172.24.16.20/python/fly_moon_bigdata.git' } } - stage('获取提交信息') { + 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}" - } + echo("123") + sh "ssh ${REMOTE_HOST} 'sh /data/sh/kill_executor.sh'" } } - stage('登录容器仓库') { + 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 - ''' - } + sh """ + ssh ${REMOTE_HOST} 'mkdir -p ${REMOTE_PROJECT_PATH}' + rsync -avz --exclude 'venv' ${WORKSPACE}/ ${REMOTE_HOST}:${REMOTE_PROJECT_PATH}/ + """ } } - stage('构建容器镜像') { + stage('安装依赖') { steps { - script { - // 构建镜像,添加标签信息 - sh """ - docker build -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}'" \ - . - """ - } + sh """ + ssh ${REMOTE_HOST} ' + cd ${REMOTE_PROJECT_PATH} && + source ~/.bashrc && + conda activate search && + source ${VENV_DIR}/bin/activate && + pip install -r src/xxljob_monitor/requirements.txt + ' + """ } } - stage('推送镜像到仓库') { + 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" - - // 登出仓库 - sh "docker logout ${REGISTRY}" - } + echo("启动") + sh "ssh ${REMOTE_HOST} 'nohup python ${REMOTE_PROJECT_PATH}/src/xxljob_monitor/executor.py > ${REMOTE_PROJECT_PATH}/src/xxljob_monitor/output.log 2>&1 &'" } } } post { - always { - 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 "docker logout ${REGISTRY}" - echo "容器仓库已登出,本地凭证已清理" - } success { - // 输出构建结果 - echo "镜像构建成功!" - sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" - echo "镜像地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - echo "latest 标签地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" - echo "对应代码提交:${GIT_COMMIT_SHORT}(${GIT_COMMIT_MSG})" + echo '✅ 部署成功!' } failure { - // 输出构建结果 - echo "镜像构建失败!" - sh "docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedSince}}\\t{{.Size}}'" - echo "镜像地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - echo "latest 标签地址:${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" - echo "对应代码提交:${GIT_COMMIT_SHORT}(${GIT_COMMIT_MSG})" + echo '❌ 部署失败,请检查日志!' } } -} \ No newline at end of file +}