fff

2fc01b1c · wentao.suo · 7ef11a8c · 2fc01b1c · 2fc01b1c
Commit 2fc01b1c authored Apr 03, 2018 by wentao.suo
Show whitespace changes
Inline Side-by-side

Showing with 59 additions and 60 deletions

Utils.groovy src/org/qg/docker_new/Utils.groovy +4 -2

qgDockerPiplineWithDocer.groovy vars/qgDockerPiplineWithDocer.groovy +55 -58

No files found.
--- a/src/org/qg/docker_new/Utils.groovy
+++ b/src/org/qg/docker_new/Utils.groovy
@@ -36,7 +36,9 @@ def beautyEcho(content, type) {
        break
    }
 		
+		ansiColor('xterm') {
 	    echo result
+		}
 }

 def copyDockerFiles() {

--- a/vars/qgDockerPiplineWithDocer.groovy
+++ b/vars/qgDockerPiplineWithDocer.groovy
@@ -33,7 +33,7 @@ def call(body) {
    body.resolveStrategy = Closure.DELEGATE_FIRST
    body.delegate = config
    body()
-			ansiColor('xterm') {
+
    node {   
 			  
 			try { 
@@ -101,7 +101,7 @@ def call(body) {
 					
 					currentBuild.result = 'FAILED'
 					_utils.beautyEcho(err, "fail")
-							}
+					
 				}catch (err1) {
 					_utils.beautyEcho(err, "fail")
 				}
@@ -111,8 +111,5 @@ def call(body) {
 				_stage.clean_images(imageTag)
 			}
    }
-			}
-		}
-	}
 }