移除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, cluster) {
+def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir) {
     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 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}")
+            def image = docker.build(imageTag, "--build-arg --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") {
@@ -248,9 +248,9 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
     return imageTag
 }
     
-def deploy(namespace, systemName, imageTag, tier, isDeploy) {
+/*def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     def deploy_job_info
-    
+
     if (isDeploy=="true") {
         _utils().beautyEcho("[旧集群][deploy]将镜像更新到到Namespace:" + namespace, "info")
         deploy_job_info = build job: '3.deployer.Updater', parameters: [
@@ -258,13 +258,13 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
           string(name:'name', value: "${systemName}"),
           string(name:'image', value: "${imageTag}"),
           string(name:'tier', value: "${tier}")]
-        
+
         log = Jenkins.getInstance().getItemByFullName('3.deployer.Updater').getBuildByNumber(deploy_job_info.getNumber()).logFile.text
         return log
     }else{
         _utils().beautyEcho("namespace:[${namespace}]不存在，不执行deploy", "info")
     }
-}
+}*/
 
 def deployV2(namespace, systemName, imageTag, tier, isDeploy) {
     def deploy_job_info

vars/qgDockerPipeline.groovy

@@ -16,7 +16,6 @@ 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]
@@ -111,18 +110,15 @@ def call(body) {
             		            _stage.copy_files_java(systemName, contextDir)
             		        }
 												
-                            imageTag = _stage.dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir, cluster)
+                            imageTag = _stage.dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir)
                         }
 
                         stage('Deploy To K8s Cluster') {
                             _utils.beautyEcho("Deploy To K8s Cluster", "stage")
 							
 							def deploy_log
-							if (config.cluster == "271") {
-								deploy_log = _stage.deployV2(namespace, systemName, imageTag, config.tier, isDeploy)
-							}else{
-	                            deploy_log = _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
-							}
+							deploy_log = _stage.deployV2(namespace, systemName, imageTag, config.tier, isDeploy)
+
 							_utils.beautyEcho(deploy_log, "info")
                         }