From 679a1e5d052ca9ed43533cc1cfbcd1860a02e065 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@hbbh.com>
Date: Wed, 06 Apr 2022 10:44:27 +0800
Subject: [PATCH] add version to 1.9.1
---
Jenkinsfile | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7c4cca9..5fbfd58 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,14 +30,14 @@
}
}
- stage('testMaven') {
- steps {
+ //stage('testMaven') {
+ //steps {
- sh 'mvn clean test -U'
- junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
+ //sh 'mvn clean test -U'
+ //junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
- }
- }
+ //}
+ //}
stage('testFunction') {
steps {
sh 'echo test'
@@ -49,30 +49,46 @@
steps {
sh '''#!/bin/sh
####maven编译部署#####
- mvn clean package -U
+ ##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\')
+ 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"
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
+ ##cd target
+ ##mkdir \$dir_name
+ ##cp *.war \$dir_name
+ ##zip -r "\$dir_name.zip" \$dir_name
'''
}
}
- stage('version add') {
+
+ 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"
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ }
+ }
+
+ stage('version add develop') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
//2. 有任意浏览器页面资源文件修改
//3. 不包含[项目名.java]文件的修改
allOf {
- not {
- branch 'master'
- }
anyOf {
changeset "**/*.js"
changeset "**/*.css"
@@ -84,12 +100,14 @@
not {
changeset "**/${project_name}.java"
}
+ branch 'develop'
}
}
steps {
- versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
+
stage('deploy') {
when { branch 'master' }
steps {
--
Gitblit v1.9.1