From f68774bbe77da553ba482ca15c9fc0f810f69448 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 23 Feb 2022 15:46:17 +0800
Subject: [PATCH] 测试

---
 Jenkinsfile |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c9781f5..8eeb115 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,11 @@
         }
     options {
         //给日志加上时间错, 需安装 Timestamper 插件
+        //mvn test surefire-report:report
         timestamps()
+        ansiColor('xterm')
+        //丢弃旧的构建前两个为发布包保留天数(比此早的发布包将被删除,但构建的日志、操作历史、报告等将被保留)和构建个数
+        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
 
     }
     stages {
@@ -26,13 +30,69 @@
 
             }
         }
-        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 'echo test'
             }
         }
-        stage('version add') {
+
+        //将项目打成war并归档,将配置文件目录存入stash
+        stage('package') {
+            steps {
+                sh '''#!/bin/sh
+                    ####maven编译部署#####
+                    ##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}" =~ "\$str"]];then
+                        echo "包含"
+                    else
+                        echo "不包含"
+                    fi
+                    dir_name=\${project_name}"-"\$old_version_all
+                    echo "dir_name \$dir_name"
+                    ##cd target
+                    ##mkdir \$dir_name
+                    ##cp *.war \$dir_name
+                    ##zip -r "\$dir_name.zip" \$dir_name
+                '''
+            }
+        }
+
+        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分支触发
+                //2. 有任意浏览器页面资源文件修改
+                //3. 不包含[项目名.java]文件的修改
                 allOf {
                     anyOf {
                         changeset "**/*.js"
@@ -45,13 +105,16 @@
                     not {
                         changeset "**/${project_name}.java"
                     }
+                    branch 'develop'
                 }
             }
             steps {
-                versionAdd("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+                versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
             }
         }
+
         stage('deploy') {
+            when { branch 'master' }
             steps {
                 sh 'echo test'
             }

--
Gitblit v1.9.1