From d6e808d4e3189795346a058f4a9499ece4fd6817 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 09 Mar 2022 11:22:55 +0800
Subject: [PATCH] ttt10
---
Jenkinsfile | 100 +++++++++++++++++++++++--------------------------
1 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fcc5547..e736b68 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,29 +20,31 @@
stages {
stage('source') {
steps {
- checkout([$class: 'GitSCM'
- , branches: [[name: "${GIT_BRANCH}"]]
- , doGenerateSubmoduleConfigurations: false
- , extensions: []
- , submoduleCfg: []
- , userRemoteConfigs: [[credentialsId: "${GIT_CREDENTIALS_ID}", url: "${url}"]]
- ])
+ script{
+ def changeLogSets = checkout([$class: 'GitSCM'
+ , branches: [[name: "${GIT_BRANCH}"]]
+ , doGenerateSubmoduleConfigurations: false
+ , extensions: []
+ , submoduleCfg: []
+ , userRemoteConfigs: [[credentialsId: "${GIT_CREDENTIALS_ID}", url: "${url}"]]
+ ])
+ println "changeLogSets ${changeLogSets}"
+ GIT_COMMIT = changeLogSets.get("GIT_COMMIT")
+ GIT_PREVIOUS_COMMIT = changeLogSets['GIT_PREVIOUS_COMMIT']
+ env.GIT_COMMIT_AUTHOR = sh (script: 'git log -1 --oneline --pretty=%an ${GIT_COMMIT}', returnStdout: true).trim()
+ env.GIT_COMMIT_MSG = sh (script: 'git log --oneline --pretty=%s ${GIT_PREVIOUS_COMMIT}...${GIT_COMMIT}| sed = |sed "N;s/\\n/./"', returnStdout: true).trim()
+ }
}
}
- stage('testMaven') {
- steps {
+ //stage('testMaven') {
+ //steps {
- sh 'mvn clean test -U'
- junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
+ //sh 'mvn clean test -U'
+ //junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
- }
- }
- stage('testFunction') {
- steps {
- sh 'echo test'
- }
- }
+ //}
+ //}
//将项目打成war并归档，将配置文件目录存入stash
stage('package') {
@@ -51,12 +53,9 @@
####maven编译部署#####
##mvn clean package -U
##处理结果包
- old_version=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*(([0-9]+\\.)*[0-9]+).*;/\\1/p\')
- if [ "\$old_version_all" =~ "-" ];then
- echo "包含"
- else
- echo "不包含"
- fi
+ versionFile=\$(find . -iname "${project_name}.java")
+ str="-"
+ old_version_all=\$(cat \$versionFile | sed -nr \'s/^[^0-9]*"([^"]+)".*;/\\1/p\')
echo "old_version_all \$old_version_all"
echo "project_name \$project_name"
dir_name=\${project_name}"-"\$old_version_all
@@ -65,32 +64,8 @@
##mkdir \$dir_name
##cp *.war \$dir_name
##zip -r "\$dir_name.zip" \$dir_name
+ exit 1
'''
- }
- }
- stage('version add master') {
- when {
- //版本号自动添加逻辑需同时符合下列触发条件：
- //1. 不能在master分支触发
- //2. 有任意浏览器页面资源文件修改
- //3. 不包含[项目名.java]文件的修改
- allOf {
- anyOf {
- changeset "**/*.js"
- changeset "**/*.css"
- changeset "**/*.html"
- changeset "**/*.xhtml"
- changeset "**/*.jpg"
- changeset "**/*.png"
- }
- not {
- changeset "**/${project_name}.java"
- }
- branch 'master'
- }
- }
- steps {
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
@@ -106,11 +81,11 @@
steps {
//http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
echo "todo version add"
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
- stage('version add master') {
+ stage('version add develop') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
@@ -132,14 +107,33 @@
}
}
steps {
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
stage('deploy') {
when { branch 'master' }
steps {
- sh 'echo test'
+ sh 'echo test2'
+ }
+ }
+ }
+
+ post {
+ unsuccessful {
+ script{
+ String msg = '''
+ 当前构建失败<br>
+ ---------------------<br>
+ 提交人：${GIT_COMMIT_AUTHOR}<br>
+ 提交信息:<br>
+ ${GIT_COMMIT_MSG}<br>
+ ---------------------<br>
+ 构建内网链接：${BUILD_URL}console
+ '''
+ msg = msg.replaceAll("\n","")
+ def number = "964606955"
+ sendMessage(true,number,msg);
}
}
}
--
Gitblit v1.9.1