|
@@ -16,17 +16,12 @@ pipeline {
|
|
|
genericVariables: [
|
|
|
[key: 'ref', value: '$.ref']
|
|
|
],
|
|
|
-
|
|
|
causeString: 'Triggered on $ref',
|
|
|
-
|
|
|
token: 'android-cloud-h5',
|
|
|
tokenCredentialId: '',
|
|
|
-
|
|
|
silentResponse: false,
|
|
|
printPostContent: true,
|
|
|
printContributedVariables: true,
|
|
|
-
|
|
|
-
|
|
|
regexpFilterExpression: 'refs/heads/' + env.BRANCH_NAME,
|
|
|
regexpFilterText: '$ref'
|
|
|
)
|
|
@@ -57,15 +52,16 @@ pipeline {
|
|
|
stage('构建项目') {
|
|
|
steps {
|
|
|
script {
|
|
|
- if ( env.TAG_NAME ) {
|
|
|
- nodejs('v16') {
|
|
|
- sh 'npm run build:prod'
|
|
|
- }
|
|
|
- } else if ( env.BRANCH_NAME == 'master' ) {
|
|
|
+ // if (env.TAG_NAME) {
|
|
|
+ // nodejs('v16') {
|
|
|
+ // sh 'npm run build:prod'
|
|
|
+ // }
|
|
|
+ // } else
|
|
|
+ if (env.BRANCH_NAME == 'master') {
|
|
|
nodejs('v16') {
|
|
|
sh 'npm run build:prod'
|
|
|
}
|
|
|
- } else if ( env.BRANCH_NAME == 'uat' ) {
|
|
|
+ } else if (env.BRANCH_NAME ==~ /^(release\/.+)$/) {
|
|
|
nodejs('v16') {
|
|
|
sh 'npm run build:uat'
|
|
|
}
|
|
@@ -92,9 +88,9 @@ pipeline {
|
|
|
steps {
|
|
|
// echo '开始构建docker镜像'
|
|
|
script {
|
|
|
- if ( env.BRANCH_NAME == 'master' ) {
|
|
|
+ if (env.BRANCH_NAME == 'master') {
|
|
|
BUILD_DOCKER_JOB = 'cloud_build_docker_nginx_prod'
|
|
|
- } else if ( env.BRANCH_NAME ==~ /^(release\/.+)$/ ) {
|
|
|
+ } else if (env.BRANCH_NAME ==~ /^(release\/.+)$/) {
|
|
|
BUILD_DOCKER_JOB = 'cloud_build_docker_nginx_pre'
|
|
|
} else {
|
|
|
BUILD_DOCKER_JOB = 'cloud_build_docker_nginx_powerful_test'
|