Ver código fonte

feat(jenkins): 更新配置,优化自动构建

zengzhixiang 2 anos atrás
pai
commit
4ca57608f8
1 arquivos alterados com 18 adições e 22 exclusões
  1. 18 22
      Jenkinsfile

+ 18 - 22
Jenkinsfile

@@ -38,6 +38,12 @@ pipeline {
     stage('初始化构建环境') {
       steps {
         echo "env.ref: ${env.ref}"
+        script {
+          if (env.ref) {
+            params.auto_run_docker_nginx_build_job = true
+            params.auto_run_docker_nginx_pull_job = true
+          }
+        }
         echo "自动运行docker构建任务: ${params.auto_run_docker_nginx_build_job}"
         echo "自动运行docker发布任务: ${params.auto_run_docker_nginx_pull_job}"
 
@@ -45,17 +51,7 @@ pipeline {
         // params.auto_run_docker_nginx_build_job === false
         // env.auto_run_docker_nginx_build_job === "false"
 
-        // script {
-        //   if (env.auto_run_docker_nginx_build_job) {
-        //     echo "env.auto_run_docker_nginx_build_job == true"
-        //   }
-        //   if (params.auto_run_docker_nginx_build_job) {
-        //     echo "params.auto_run_docker_nginx_build_job == true"
-        //   }
-        //   if (auto_run_docker_nginx_build_job) {
-        //     echo "auto_run_docker_nginx_build_job == true"
-        //   }
-        // }
+
         // echo "params.auto_run_docker_nginx_pull_job: ${params.auto_run_docker_nginx_pull_job}"
         // echo 'env.BRANCH_NAME: ' + env.BRANCH_NAME
         // echo 'env.BUILD_NUMBER: ' + env.BUILD_NUMBER
@@ -104,8 +100,8 @@ pipeline {
           anyOf {
             branch "develop"
             // branch 'uat'
-            branch "master"
-            branch "release/*"
+            // branch "master"
+            // branch "release/*"
             // expression { BRANCH_NAME ==~ /^(release\/.+)$/ }
           }
         }
@@ -146,15 +142,15 @@ pipeline {
       }
       steps {
         echo '开始发布docker镜像'
-        // script {
-        //   if ( env.BRANCH_NAME == 'master' ) {
-        //     env.PULL_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
-        //   } else if ( env.BRANCH_NAME == 'uat' ) {
-        //     env.PULL_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
-        //   } else {
-        //     env.PULL_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
-        //   }
-        // }
+        script {
+          if ( env.BRANCH_NAME == 'master' ) {
+            // env.PULL_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
+          } else if ( env.BRANCH_NAME == 'uat' ) {
+            env.PULL_DOCKER_JOB = 'cloud_publish_docker_pre'
+          } else {
+            env.PULL_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
+          }
+        }
         echo "build job: ${env.PULL_DOCKER_JOB}"
         build job: env.PULL_DOCKER_JOB, parameters: [extendedChoice(name: 'service', value: 'cloud-nginx'), string(name: 'version', value: env.BUILD_TAG), string(name: 'replicas', value: '3'), string(name: 'memory', value: '2G'), string(name: 'cpu', value: '2')]
       }