From 1961203b2c9c03e98791bdee99c79cc75c972fe8 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Tue, 08 Mar 2022 17:50:06 +0800
Subject: [PATCH] 补充5
---
Jenkinsfile | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 076d05a..53705fc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,29 +20,36 @@
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['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 '''
+ git log --oneline --pretty=%s ${GIT_PREVIOUS_COMMIT}...${GIT_COMMIT}
+ '''
+
+ //sh (script: '', 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 +58,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
@@ -68,7 +72,24 @@
'''
}
}
- stage('version add') {
+
+ stage('master version add') {
+ when {
+ not {
+ allOf {
+ changeset "**/${project_name}.java"
+ }
+ }
+ branch 'master'
+ }
+ steps {
+ //http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
+ echo "todo version add"
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ }
+ }
+
+ stage('version add develop') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
@@ -90,9 +111,10 @@
}
}
steps {
- versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
+
stage('deploy') {
when { branch 'master' }
steps {
@@ -100,4 +122,13 @@
}
}
}
+
+ post {
+ always {
+ echo "执行完成 \n提交人：${env.GIT_COMMIT_AUTHOR}\n提交信息:\n${env.GIT_COMMIT_MSG}"
+ }
+ unsuccessful{
+ echo 'unsuccessful '
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1