dockerNode

src/org/qg/StageBucket.groovy

@@ -83,11 +83,6 @@ def build_ui(namespace, systemName, contextDir, repoName, branchName, workspace)
     sh "cp -rf /home/quant_group/jenkins_home/workspace/pre.${systemName}/node_modules/ node_modules"
     sh "mv -f env.config.js ${configPath}"
     
-    dockerNode(image: "192.168.4.36/publibs/nodejs-slave") {
-      git "https://github.com/wakaleo/game-of-life"
-      sh 'mvn clean test'
-    }
-    
     def bowerFile = fileExists './bower.json'
     
     if (bowerFile) {

vars/qgDockerPipeline.groovy

@@ -29,76 +29,80 @@ def call(body) {
 
     node {
         try {
-            stage('Clean') {
-                _utils.beautyEcho(1, 'Clean')
-                _stage.clean_dir()
-            }
             
-            stage('Checkout') {
-                _utils.beautyEcho(2, 'Checkout')
-                _stage.checkout(branchName, gitRepo)
-            }
+            dockerNode(image: "192.168.4.36/publibs/nodejs-slave") {
+                stage('Clean') {
+                    _utils.beautyEcho(1, 'Clean')
+                    _stage.clean_dir()
+                }
             
-            stage('Prepare') {
-                _utils.beautyEcho(3, 'Prepare')
-                contextDir = _utils.contextDir(workspace)
-                switch (config.buildType) {
-                    case "java":
-                        _stage.prepare_java(systemName, contextDir)
-                        break
-                    case "ui":
-                        _stage.prepare_ui(systemName, contextDir)
-                        break
-                    case "nodejs":
-                        _stage.prepare_nodejs(systemName, contextDir)
-                        break
-                    case "python":
-                        _stage.prepare_python(contextDir)
-                        break
-                    default:
-                        echo "未知的buildType: ${config.buildType}"
-                        break
+                stage('Checkout') {
+                    _utils.beautyEcho(2, 'Checkout')
+                    _stage.checkout(branchName, gitRepo)
                 }
-            }
             
-            stage('Build') {
-                _utils.beautyEcho(4, 'Build')             
-                switch (config.buildType) {
-                    case "java":
-                        _stage.build_java(namespace, systemName, contextDir)
-                        break
-                    case "ui":
-                        _stage.build_ui(namespace, systemName, contextDir, gitRepo, branchName, workspace)
-                        break                        
-                    case  "nodejs":
-                        _stage.build_nodejs(namespace, systemName, contextDir, gitRepo, branchName, workspace)
-                        break
-                    case "python":
-                        _stage.build_python(namespace, systemName, contextDir)
-                        break
-                    default:
-                        echo "未知的buildType: ${config.buildType}"
-                        break
+                stage('Prepare') {
+                    _utils.beautyEcho(3, 'Prepare')
+                    contextDir = _utils.contextDir(workspace)
+                    switch (config.buildType) {
+                        case "java":
+                            _stage.prepare_java(systemName, contextDir)
+                            break
+                        case "ui":
+                            _stage.prepare_ui(systemName, contextDir)
+                            break
+                        case "nodejs":
+                            _stage.prepare_nodejs(systemName, contextDir)
+                            break
+                        case "python":
+                            _stage.prepare_python(contextDir)
+                            break
+                        default:
+                            echo "未知的buildType: ${config.buildType}"
+                            break
+                    }
+                }
+            
+                stage('Build') {
+                    _utils.beautyEcho(4, 'Build')             
+                    switch (config.buildType) {
+                        case "java":
+                            _stage.build_java(namespace, systemName, contextDir)
+                            break
+                        case "ui":
+                            _stage.build_ui(namespace, systemName, contextDir, gitRepo, branchName, workspace)
+                            break                        
+                        case  "nodejs":
+                            _stage.build_nodejs(namespace, systemName, contextDir, gitRepo, branchName, workspace)
+                            break
+                        case "python":
+                            _stage.build_python(namespace, systemName, contextDir)
+                            break
+                        default:
+                            echo "未知的buildType: ${config.buildType}"
+                            break
+                    }
                 }
-            }
 
-            stage('Docker Build And Push') {
-                _utils.beautyEcho(5, 'Docker Build And Push')   
-                if (config.buildType == "java") {
-		            _stage.copy_files_java(systemName, contextDir)
-		        }
-                imageTag = _stage.dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, contextDir)
-            }
+                stage('Docker Build And Push') {
+                    _utils.beautyEcho(5, 'Docker Build And Push')   
+                    if (config.buildType == "java") {
+    		            _stage.copy_files_java(systemName, contextDir)
+    		        }
+                    imageTag = _stage.dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, contextDir)
+                }
 
-            stage('Deploy') {
-                _utils.beautyEcho(6, 'Docker Build And Push')  
-                _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
-            }
+                stage('Deploy') {
+                    _utils.beautyEcho(6, 'Docker Build And Push')  
+                    _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
+                }
             
-            stage("Clean") {
-                _utils.beautyEcho(7, 'Clean')  
-                _stage.clean_images(imageTag)
+                stage("Clean") {
+                    _utils.beautyEcho(7, 'Clean')  
+                    _stage.clean_images(imageTag)
+                }
             }
+            
         } catch (err) {
             if (imageTag) {
                 _stage.clean_images(imageTag)