From d5bdc9081590e1da099378c3624f0ce999d9a7d7 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 23 Feb 2022 15:44:22 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 076d05a..b269c18 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@
stage('testMaven') {
steps {
- sh 'mvn clean test -U'
+ //sh 'mvn clean test -U'
junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
}
@@ -51,14 +51,16 @@
####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
+ 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"
+ if [["\${old_version_all}" =~ "\$str"]];then
echo "包含"
else
echo "不包含"
fi
- echo "old_version_all \$old_version_all"
- echo "project_name \$project_name"
dir_name=\${project_name}"-"\$old_version_all
echo "dir_name \$dir_name"
##cd target
@@ -68,7 +70,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"
+ //versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ }
+ }
+
+ stage('version add master') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
@@ -90,9 +109,10 @@
}
}
steps {
- versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
+
stage('deploy') {
when { branch 'master' }
steps {
--
Gitblit v1.9.1