feat(jenkins): docker发布任务交给下游处理

Jenkinsfile

@@ -9,7 +9,8 @@ pipeline {
   // }
   environment {
     // docker的包名
-    DOCKER_VERSION = env.BUILD_TAG.replace("%2F","-")
+    // DOCKER_VERSION = env.BUILD_TAG.replace("%2F","-")
+    DOCKER_VERSION = "" // 空版本号，由下游任务自动生成
   }
   options{
     disableConcurrentBuilds()
@@ -131,44 +132,44 @@ pipeline {
         echo '开始构建docker镜像'
         echo "DOCKER_VERSION: ${env.DOCKER_VERSION}"
         echo "build job: ${env.BUILD_DOCKER_JOB}"
-        build job: env.BUILD_DOCKER_JOB, parameters: [string(name: 'version', value: env.DOCKER_VERSION), extendedChoice(name: 'service', value: 'manage_H5'),  booleanParam(name: 'auto_run_docker_nginx_pull_job', value: false), string(name: 'manage_H5_workspace', value: env.WORKSPACE)]
-      }
-    }
-    stage('发布docker镜像') {
-      when {
-        allOf {
-          expression { env.auto_run_docker_nginx_build_job == "true" }
-          expression { env.auto_run_docker_nginx_pull_job == "true" }
-          anyOf {
-            branch 'develop'
-            branch "release/*"
-            // branch 'master'
-            // branch 'uat'
-            // expression { BRANCH_NAME ==~ /^(release\/.+)$/ }
-          }
-        }
-      }
-      environment {
-        // 发布docker的任务名
-        PULL_DOCKER_JOB = """${sh(
-          returnStdout: true,
-          script: """
-            if [[ "$BRANCH_NAME" == "master" ]];then
-              echo ""
-            elif [[ "$BRANCH_NAME" =~ ^release\\/.* ]];then
-              echo "cloud_publish_docker_pre"
-            else
-              echo "cloud_publish_docker_powerful_test"
-            fi
-          """
-        ).trim()}"""
-      }
-      steps {
-        echo '开始发布docker镜像'
-        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.DOCKER_VERSION), string(name: 'replicas', value: '3'), string(name: 'memory', value: '2G'), string(name: 'cpu', value: '2')]
+        build job: env.BUILD_DOCKER_JOB, parameters: [string(name: 'version', value: env.DOCKER_VERSION), extendedChoice(name: 'service', value: 'manage_H5'),  booleanParam(name: 'auto_run_docker_nginx_pull_job', value: env.auto_run_docker_nginx_pull_job == "true"), string(name: 'manage_H5_workspace', value: env.WORKSPACE)]
       }
     }
+    // stage('发布docker镜像') {
+    //   when {
+    //     allOf {
+    //       expression { env.auto_run_docker_nginx_build_job == "true" }
+    //       expression { env.auto_run_docker_nginx_pull_job == "true" }
+    //       anyOf {
+    //         branch 'develop'
+    //         branch "release/*"
+    //         // branch 'master'
+    //         // branch 'uat'
+    //         // expression { BRANCH_NAME ==~ /^(release\/.+)$/ }
+    //       }
+    //     }
+    //   }
+    //   environment {
+    //     // 发布docker的任务名
+    //     PULL_DOCKER_JOB = """${sh(
+    //       returnStdout: true,
+    //       script: """
+    //         if [[ "$BRANCH_NAME" == "master" ]];then
+    //           echo ""
+    //         elif [[ "$BRANCH_NAME" =~ ^release\\/.* ]];then
+    //           echo "cloud_publish_docker_pre"
+    //         else
+    //           echo "cloud_publish_docker_powerful_test"
+    //         fi
+    //       """
+    //     ).trim()}"""
+    //   }
+    //   steps {
+    //     echo '开始发布docker镜像'
+    //     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.DOCKER_VERSION), string(name: 'replicas', value: '3'), string(name: 'memory', value: '2G'), string(name: 'cpu', value: '2')]
+    //   }
+    // }
   }
 }