From 87720da0cb1d23a8b23a3961c2c9172f4f2621a2 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Tue, 18 Jan 2022 15:47:02 +0800
Subject: [PATCH] 更新
---
Jenkinsfile | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d352ac7..3060362 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,8 +10,10 @@
}
options {
//给日志加上时间错， 需安装 Timestamper 插件
+ //mvn test surefire-report:report
timestamps()
ansiColor('xterm')
+ //丢弃旧的构建前两个为发布包保留天数（比此早的发布包将被删除，但构建的日志、操作历史、报告等将被保留）和构建个数
buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
}
@@ -28,12 +30,20 @@
}
}
- stage('test') {
+ stage('testMaven') {
+ steps {
+
+ sh 'mvn clean test -U'
+ junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
+
+ }
+ }
+ stage('testFunction') {
steps {
sh '''
#定义颜色的变量
- RED_COLOR='\\E[1;31m' #红
+ RED_COLOR='\\033[1;31m' #红
GREEN_COLOR='\\E[1;32m' #绿
YELOW_COLOR='\\E[1;33m' #黄
BLUE_COLOR='\\E[1;34m' #蓝
@@ -53,7 +63,7 @@
echo -e "\\033[47;30m 白底黑字 \\033[0m"
echo "#######################################"
#直接把echo -e放到变量里面，使用的时候直接输出变量即可
- SETCOLOR_SUCCESS="echo -en \\033[1;31m"
+ SETCOLOR_SUCCESS="echo -en \\033[1;32m"
SETCOLOR_FAILURE="echo -en \\033[1;31m"
SETCOLOR_WARNING="echo -en \\033[1;33m"
SETCOLOR_NORMAL="echo -en \\033[0;39m"
@@ -62,7 +72,7 @@
echo ----需注意！----- && \$SETCOLOR_WARNING
echo ----正常的！----- && \$SETCOLOR_NORMAL
- echo "BRANCH ${GIT_BRANCH}"
+ echo -e "\${GREEN_COLOR}BRANCH ${GIT_BRANCH}\${RES}"
printenv
'''
test("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
@@ -70,6 +80,10 @@
}
stage('version add') {
when {
+ //版本号自动添加逻辑需同时符合下列触发条件：
+ //1. 不能在master分支触发
+ //2. 有任意浏览器页面资源文件修改
+ //3. 不包含[项目名.java]文件的修改
allOf {
not {
branch 'master'
@@ -87,10 +101,9 @@
}
}
}
- steps{
- echo "todo add version"
+ steps {
+ versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
-
}
stage('deploy') {
when { branch 'master' }
--
Gitblit v1.9.1