|
|
@@ -5,9 +5,9 @@ def build = new org.devops.build()
|
|
|
def color = new org.devops.color()
|
|
|
def systemtime = new org.devops.systemtime()
|
|
|
|
|
|
-def String cpu = "${env.cpu}"
|
|
|
-def String imagePrefix = "${env.imagePrefix}"
|
|
|
-def String buildImage = "${env.buildImage}"
|
|
|
+String cpu = "${env.cpu}"
|
|
|
+String imagePrefix = "${env.imagePrefix}"
|
|
|
+String buildImage = "${env.buildImage}"
|
|
|
|
|
|
pipeline {
|
|
|
agent {
|
|
|
@@ -46,15 +46,11 @@ pipeline {
|
|
|
script {
|
|
|
version = build.GetMvnParentVersion()
|
|
|
systime = systemtime.GetSysTime('yyMMdd')
|
|
|
- //将打出来的tar包，按照命名规范命名。根据实际情况，修改对应的系统简称和区域标识（DCUC-AUTH-BACK-TJDSJ）
|
|
|
- //如果是单模块项目，则直接cd target；如果是多模块项目，则是cd 模块名称/target
|
|
|
+ //将打出来的tar包，按照命名规范命名。根据实际情况，修改对应的系统简称和区域标识（APPROVE-GATEWAY-TJDSJ）
|
|
|
sh """cd target
|
|
|
cp approve-gateway-*.tar.gz APPROVE-GATEWAY-TJDSJ-${version}-${env.GIT_COMMIT.take(8)}-BETA-${systime}.tar.gz
|
|
|
"""
|
|
|
- //将复制的按照命名规范的tar包提取到Jenkins的面板，方便下载。根据实际情况，修改对应的系统简称和区域标识（DCUC-AUTH-BACK-TJDSJ）
|
|
|
- //如果是单模块项目，则直接target/xxxxx；如果是多模块项目，则是模块名称/target/xxxx
|
|
|
- //多模块写法：archiveArtifacts artifacts: 'dcuc-auth-back/target/DCUC-AUTH-BACK-TJDSJ-*.tar.gz'
|
|
|
- //单模块写法：
|
|
|
+ //将复制的按照命名规范的tar包提取到Jenkins的面板，方便下载。根据实际情况，修改对应的系统简称和区域标识（APPROVE-GATEWAY-TJDSJ）
|
|
|
archiveArtifacts artifacts: 'target/APPROVE-GATEWAY-TJDSJ-*.tar.gz'
|
|
|
}
|
|
|
}
|
|
|
@@ -64,7 +60,7 @@ pipeline {
|
|
|
stage('DOCKER-BUILD') {
|
|
|
when {
|
|
|
expression {
|
|
|
- return (buildImage == 'true')
|
|
|
+ return (buildImage == 'true')
|
|
|
}
|
|
|
}
|
|
|
steps {
|
黄资权