ffff

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -66,18 +66,14 @@ def call(body) {
 					
 					/*  3 */
 					withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
-							_utils.beautyEcho("make docker image", "stage")		
-							imageTag = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)	
-							_stage.dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp)
-								
-							
-							
-						
-							_utils.beautyEcho("Deploy To K8s Cluster", "stage")		
-							_utils.beautyEcho("Deploy image: ${imageTag} to:${namespace}", "info")						
-							_stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
+						_utils.beautyEcho("make docker image", "stage")		
+						imageTag = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)	
+						_stage.dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp)											
+					
+						_utils.beautyEcho("Deploy To K8s Cluster image: ${imageTag} to:${namespace}", "stage")											
+						_stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
 																				
-						}				
+						
 						
 					}
 					
@@ -87,13 +83,10 @@ def call(body) {
 						_stage.clean_images(imageTag,contextDir)																		
 					}
 								 				
-				}catch (err) {
-				
+				} catch (err) {
 					_utils.beautyEcho(err, "fail")
 					_stage.clean_images(imageTag,contextDir)					
-					throw err
-					
-				
+					throw err			
 	      }
 	    }
 		}