增加cluster参数，用于区分生产镜像和测试开发镜像

src/org/qg/docker/StageBucket.groovy

@@ -222,7 +222,7 @@ def build_luaui(namespace, systemNames, contextDir) {
     }
 }
 
-def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir) {
+def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir, cluster) {
     regex = "[`,./;\\[\\]&<>?:\"()|-]+"
     
     k8sSystemName = systemName.replaceAll("_","-")
@@ -234,7 +234,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
 
     withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
         withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
-            def image = docker.build(imageTag, "--build-arg BUILD_TIME=${timeNow} --build-arg BUILD_NUMBER=${buildNumber} --build-arg SYSTEM_NAME=${systemName} --build-arg BRANCH_NAME=${branchName} --build-arg SAFE_SYSTEM_NAME=${defaultSystemName} ${contextDir}")
+            def image = docker.build(imageTag, "--build-arg CLUSTER=${cluster} --build-arg BUILD_TIME=${timeNow} --build-arg BUILD_NUMBER=${buildNumber} --build-arg SYSTEM_NAME=${systemName} --build-arg BRANCH_NAME=${branchName} --build-arg SAFE_SYSTEM_NAME=${defaultSystemName} ${contextDir}")
             image.push()
             
             if (branchName == "master" || branchName == "master--master") {

vars/qgDockerPipeline.groovy

@@ -16,6 +16,7 @@ def call(body) {
     def namespace = env.NAMESPACE
     def isDeploy = env.IS_DEPLOY
     def buildNumber = env.BUILD_NUMBER
+	def cluster = env.CLUSTER
 
     t = gitRepo.split("/")
     def gitGroup = t[0]
@@ -110,7 +111,7 @@ def call(body) {
             		            _stage.copy_files_java(systemName, contextDir)
             		        }
 												
-                            imageTag = _stage.dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir)
+                            imageTag = _stage.dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir, cluster)
                         }
 
                         stage('Deploy To K8s Cluster') {