From 1645cc0d859d37088669a1e5983e32a48903f532 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 14:17:11 +0800
Subject: [PATCH] 测试

---
 Jenkinsfile |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c7f93b5..69d5e1e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,8 +10,11 @@
         }
     options {
         //给日志加上时间错, 需安装 Timestamper 插件
+        //mvn test surefire-report:report
         timestamps()
         ansiColor('xterm')
+        //丢弃旧的构建前两个为发布包保留天数(比此早的发布包将被删除,但构建的日志、操作历史、报告等将被保留)和构建个数
+        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
 
     }
     stages {
@@ -27,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'  #蓝
@@ -42,7 +53,7 @@
                     #需要使用echo -e,在字符串的最后定义了033[0m,它是用来恢复了默认的文本颜色设置,这样就只会得到一个彩色提示符,而不会影响命令和其输出的颜色显示(即黑底白字)。
                     #一共有8种字体颜色可供选择,它们分别是30 (黑色)、31 (红色)、32 (绿色)、33 (黄色)、34 (蓝色)、35 ( 紫红色)、36 (青色)和37 (白色)。
                     #对于底色也有8种颜色可供选择,例如40黑底、41红底、42绿底、43黄底、44蓝底、45紫底、46天蓝底、47白底。
-                    echo -e  "\${RED_COLOR}======red color======"
+                    echo -e  "\${RED_COLOR}======red color======\${RES}"
                     echo -e  "\${YELOW_COLOR}======yelow color======\${RES}"
                     echo -e  "\${BLUE_COLOR}======green color======\${RES}"
                     echo -e  "\${GREEN_COLOR}======green color======\${RES}"
@@ -52,23 +63,45 @@
                     echo -e "\\033[47;30m 白底黑字 \\033[0m"
                     echo "#######################################"
                     #直接把echo -e放到变量里面,使用的时候直接输出变量即可
-                    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"
+                    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"
                     echo ----成功了!-----  &&  \$SETCOLOR_SUCCESS
                     echo ----失败了!-----  &&  \$SETCOLOR_FAILURE
                     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}")
             }
         }
+
+        //将项目打成war并归档,将配置文件目录存入stash
+        stage('package') {
+            steps {
+                sh '''#!/bin/sh
+                    ####maven编译部署#####
+                    mvn clean package -U
+                    ##处理结果包
+                    cd *-webapp/target
+                    old_version_all=\$(find . -iname "\${projectName}.java"| xargs sed -nr 's/^[^0-9]*\\"(([0-9]+\\.)*[0-9]+.*-[0-9]+)\\".*;/\\1/p\')
+                    dir_name=\${projectName}"-"\$old_version_all
+                    echo "dir_name \$dir_name"
+                    mkdir \$dir_name
+                    cp *.war \$dir_name
+                    zip -r "\$dir_name.zip" \$dir_name
+                '''
+            }
+        }
         stage('version add') {
             when {
+                //版本号自动添加逻辑需同时符合下列触发条件:
+                //1. 不能在master分支触发
+                //2. 有任意浏览器页面资源文件修改
+                //3. 不包含[项目名.java]文件的修改
                 allOf {
                     not {
                         branch 'master'
@@ -86,10 +119,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