From 709977d07a2e6c81be0780b9ea5dae746bdbb5e7 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 15:49:01 +0800
Subject: [PATCH] 合并分支
---
Jenkinsfile | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7370593..7c4cca9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,8 +10,12 @@
}
options {
//给日志加上时间错， 需安装 Timestamper 插件
+ //mvn test surefire-report:report
timestamps()
ansiColor('xterm')
+ //丢弃旧的构建前两个为发布包保留天数（比此早的发布包将被删除，但构建的日志、操作历史、报告等将被保留）和构建个数
+ buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
+
}
stages {
stage('source') {
@@ -26,14 +30,49 @@
}
}
- 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'
}
}
+
+ //将项目打成war并归档，将配置文件目录存入stash
+ stage('package') {
+ steps {
+ sh '''#!/bin/sh
+ ####maven编译部署#####
+ mvn clean package -U
+ ##处理结果包
+ old_version_all=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*\\"(([0-9]+\\.)*[0-9]+.*-[0-9]+)\\".*;/\\1/p\')
+ 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
+ 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'
+ }
anyOf {
changeset "**/*.js"
changeset "**/*.css"
@@ -48,10 +87,11 @@
}
}
steps {
- versionAdd("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
stage('deploy') {
+ when { branch 'master' }
steps {
sh 'echo test'
}
--
Gitblit v1.9.1