fffff

src/org/qg/docker_new/StageBucket.groovy

@@ -260,21 +260,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
     return imageTag
 }
 
-def deploy(namespace, systemName, imageTag, tier, isDeploy) {
-    def deploy_job_info
-    
-    if (isDeploy=="true") {
-	    _utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info")
-			update_microservice(namespace, systemName, imageTag, tier)
-			
-    }else{
-      _utils().beautyEcho( "isDeploy == false，不执行deploy","info")
-    }
-}
 
-def clean_images(imageTag) {
-    sh "docker rmi -f \$(docker images -q ${imageTag})"
-}
 
 @NonCPS
 def jsonParse(def json) {
@@ -360,16 +346,18 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
 	docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){
 		
 		/*checkout code*/
-		
+		stage('checkout') {
 			checkout(buildType, systemName, branchName)
-
+		}
 		/*prepare config*/
-
+		stage('prepare config') {
 			prepare_config(buildType, systemName, contextDir)
-
+		}
 		/*build*/
-		
+		stage('build'){
 			build(buildType, systemName, contextDir)
+		}
+		
 		
 		
 		
@@ -378,7 +366,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
 
 def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){
 	
-  
+  stage('make docker image') {
 		withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
 
 		def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}"
@@ -398,7 +386,29 @@ def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){
     }
 
   }
+	}
+
+}
+
+def deploy(namespace, systemName, imageTag, tier, isDeploy) {
+    
+		stage('Deploy To K8s Cluster'){
+			def deploy_job_info
+    
+	    if (isDeploy=="true") {
+		    _utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info")
+				update_microservice(namespace, systemName, imageTag, tier)
 			
+	    }else{
+	      _utils().beautyEcho( "isDeploy == false，不执行deploy","info")
+	    }
+		}
+}
 
+def clean_images(imageTag,contextDir) {
+	sh "rm -rf ${contextDir}"
+	if (imageTag){
+		clean_images(imageTag)
+	}
 }
 

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -50,8 +50,6 @@ def call(body) {
 					
 				  /*  2 */
 					withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
-					
-						stage('checkout & build') {
 						_utils.beautyEcho("checkout & build", "stage")
 						
 					  
@@ -63,20 +61,18 @@ def call(body) {
 						}
 						_utils.beautyEcho("build over", "info")	
 						
-						}
+						
 					}
 					
 					/*  3 */
 					withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
-									
-						stage('make docker image') {
 							_utils.beautyEcho("make docker image", "stage")		
 							imageTag = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)	
 							_stage.dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp)
 								
-						}	
 							
-						stage('Deploy To K8s Cluster'){
+							
+						
 							_utils.beautyEcho("Deploy To K8s Cluster", "stage")		
 							_utils.beautyEcho("Deploy image: ${imageTag} to:${namespace}", "info")						
 							_stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
@@ -88,18 +84,13 @@ def call(body) {
 					/*  4 */
 					stage('Clear Cache Tmp'){
 						_utils.beautyEcho("Clear Cache Tmp", "stage")											
-						sh "rm -rf ${contextDir}"						
-						_stage.clean_images(imageTag)																		
+						_stage.clean_images(imageTag,contextDir)																		
 					}
 								 				
 				}catch (err) {
 				
 					_utils.beautyEcho(err, "fail")
-					sh "rm -rf ${contextDir}"
-					if (imageTag){
-						_stage.clean_images(imageTag)
-					}
-					
+					_stage.clean_images(imageTag,contextDir)					
 					throw err