From 6bf72c48a105e84128d0e481fd80aa71d8f24ca6 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 09 Mar 2022 11:31:53 +0800
Subject: [PATCH] ttt13
---
Jenkinsfile | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8eeb115..09a5aba 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,14 +20,21 @@
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') {
@@ -38,11 +45,6 @@
//}
//}
- stage('testFunction') {
- steps {
- sh 'echo test'
- }
- }
//将项目打成war并归档，将配置文件目录存入stash
stage('package') {
@@ -56,17 +58,13 @@
old_version_all=\$(cat \$versionFile | sed -nr \'s/^[^0-9]*"([^"]+)".*;/\\1/p\')
echo "old_version_all \$old_version_all"
echo "project_name \$project_name"
- if [["\${old_version_all}" =~ "\$str"]];then
- echo "包含"
- else
- echo "不包含"
- fi
dir_name=\${project_name}"-"\$old_version_all
echo "dir_name \$dir_name"
##cd target
##mkdir \$dir_name
##cp *.war \$dir_name
##zip -r "\$dir_name.zip" \$dir_name
+ exit 1
'''
}
}
@@ -83,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分支触发
@@ -109,7 +107,7 @@
}
}
steps {
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
@@ -120,4 +118,23 @@
}
}
}
+
+ 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);
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1