Merge branch 'kewei' into 'master'

发送 执行ID



See merge request !1

vars/qgDockerPiplineWithDockerSlaveTke.groovy

@@ -3,17 +3,17 @@
 */
 
 def call(body) {
-	
+
 	ansiColor('xterm') {
-		
+
 		// def harborGroup = "library"
 		def _stage = new org.qg.docker_new.StageBucketTke()
 		def _utils = new org.qg.docker_new.Utils()
-	   
+
 		def config = [:]
 		def timeStemp = new Date().format("yyyyMMddHHmmssSSS")
 
-		def env = body.env	    
+		def env = body.env
 		def gitRepo = env.GIT_REPO
 		def originBranchName = env.BRANCH_NAME
 		def namespace = env.NAMESPACE
@@ -27,26 +27,26 @@ def call(body) {
 		t = gitRepo.split("/")
 		def gitGroup = t[0]
 		// systemName or systemName--systemName
-		def originSystemName = t[1]	    
+		def originSystemName = t[1]
 		// ["",""]
 		def systemNames = originSystemName.split("--")
 		def branchNames = originBranchName.split("--")
 
 		def contextDir
 		def imageTagInfos
-		def branchHashCode     
-		
+		def branchHashCode
+
 		body.resolveStrategy = Closure.DELEGATE_FIRST
 		body.delegate = config
 		body()
-		
+
 		if(config.harborGroup != null){
 			harborGroup = config.harborGroup
 		}
 
-	    node {   
-			
-			try { 
+	    node {
+
+			try {
 				echo config.buildType
 				/*  1 */
 				stage('Init') {
@@ -55,7 +55,7 @@ def call(body) {
 					_stage.init_dependency()
 					_stage.init_image_dependency(config.buildType,originSystemName,contextDir)
 				}
-					
+
 				/*  2 */
 				echo originSystemName
 				withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
@@ -65,17 +65,17 @@ def call(body) {
 							branchHashCode = _stage.check_and_build(config.buildType, systemNames[i], branchNames[i], contextDir)
 						}
 					}
-					_utils.beautyEcho("build over", "info")	
+					_utils.beautyEcho("build over", "info")
 				}
-	
+
 				/*  3 */
 				withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
-					_utils.beautyEcho("make docker image", "stage")		
+					_utils.beautyEcho("make docker image", "stage")
 					/*def _systemName = originSystemName.toLowerCase()*/
 					def regex = "[`,./;\\[\\]&<>?:\"()|-]+"
 				    def k8sSystemName = originSystemName.replaceAll("_","-").toLowerCase()
 				    def safeBranchName = originBranchName.replaceAll(regex,"_").toLowerCase()
-					
+
 					imageTagInfos = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
 
 					for	(imageTagInfo in imageTagInfos){
@@ -83,20 +83,22 @@ def call(body) {
 					}
 					_stage.deploy(namespace, originSystemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy)
 				}
-	
+
 				/*  4 */
 				stage('Clean'){
 					_utils.beautyEcho("Clear Cache Tmp", "stage")
 					_stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir,config.buildType)
+					_stage.ding_talk(buildNumber,"success")
 				}
 			} catch (err) {
 				_utils.beautyEcho(err, "fail")
+				_stage.ding_talk(buildNumber,"fail")
 				if(imageTagInfos != null){
 					_stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir,config.buildType)
-				}									
-				throw err			
+				}
+				throw err
 			}
 	    }
-		
+
 	}
 }