From 31b5e9a5f80d0f488aa63feecabd0d981ca8f3cd Mon Sep 17 00:00:00 2001
From: chengling <chengling@hbbohua.com>
Date: Fri, 22 Apr 2022 14:14:10 +0800
Subject: [PATCH] master6
---
Jenkinsfile | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f192630..5fbfd58 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,14 +30,14 @@
}
}
- 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'
@@ -52,14 +52,10 @@
##mvn clean package -U
##处理结果包
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}" =~ \'-\']];then
- echo "包含"
- else
- echo "不包含"
- fi
dir_name=\${project_name}"-"\$old_version_all
echo "dir_name \$dir_name"
##cd target
@@ -82,11 +78,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分支触发
@@ -108,7 +104,7 @@
}
}
steps {
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
--
Gitblit v1.9.1