fff

src/org/qg/docker_new/StageBucket.groovy

@@ -174,7 +174,7 @@ def build_java(namespace, systemName, contextDir) {
 
 def copy_files(buildType,target,contextDir){
 	switch(buildType){
-		case "java"
+		case "java":
 			copy_files_java(target,contextDir)
 			break
 		default
@@ -231,7 +231,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
     k8sSystemName = systemName.replaceAll("_","-")
     safeBranchName = branchName.replaceAll(regex,"_")
     defaultSystemName = "project"	
-	timeStemp = new Date().format("yyyyMMddHHmmss")
+	  timeStemp = new Date().format("yyyyMMddHHmmss")
 
     imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
 
@@ -250,24 +250,6 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
     _utils().beautyEcho("镜像地址:${imageTag}", "info")
     return imageTag
 }
-    
-/*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: [
-          string(name: 'namespace', value:"${namespace}"),
-          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