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 | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c925415..69d5e1e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,8 +78,30 @@
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'
@@ -97,11 +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