|
@@ -80,9 +80,10 @@ pipeline {
|
|
|
stage('构建docker镜像') {
|
|
|
when {
|
|
|
anyOf {
|
|
|
- branch 'master'
|
|
|
- branch 'uat'
|
|
|
branch 'develop'
|
|
|
+ // branch 'uat'
|
|
|
+ branch 'master'
|
|
|
+ expression { BRANCH_NAME ==~ /^(release\/.+)$/ }
|
|
|
}
|
|
|
}
|
|
|
environment {
|
|
@@ -93,7 +94,7 @@ pipeline {
|
|
|
script {
|
|
|
if ( env.BRANCH_NAME == 'master' ) {
|
|
|
BUILD_DOCKER_JOB = 'cloud_build_docker_nginx_prod'
|
|
|
- } else if ( env.BRANCH_NAME == 'uat' ) {
|
|
|
+ } else if ( env.BRANCH_NAME ==~ /^(release\/.+)$/ ) {
|
|
|
BUILD_DOCKER_JOB = 'cloud_build_docker_nginx_pre'
|
|
|
} else {
|
|
|
BUILD_DOCKER_JOB = 'cloud_build_docker_nginx_powerful_test'
|