Merge branch 'master' of git.quantgroup.cn:QA/global-jenkinsfile

src/org/qg/docker/StageBucket.groovy

@@ -124,8 +124,8 @@ def build_nodejs(namespace, systemName, contextDir, repoName, branchName, worksp
         sh "bower install"
     }
     
-/*    sh "cp -rf /home/quant_group/jenkins_home/workspace/pre.${systemName}/node_modules/ node_modules"
-*/    
+    sh "cp -rf /home/quant_group/jenkins_home/workspace/pre.${systemName}/node_modules/ node_modules"
+    
     sh "mv -f env.config.js ${configPath}"
     
     sh "npm install --registry=https://registry.npm.taobao.org"
@@ -182,7 +182,3 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
 def clean_images(imageTag) {
     sh "docker rmi -f \$(docker images -q ${imageTag})"
 }
\ No newline at end of file
-
-def clean_dir(contextDir) {
-    deleteDir()
-}
\ No newline at end of file

vars/qgDockerPipeline.groovy

@@ -29,10 +29,9 @@ def call(body) {
 
     node {
         try {
-            
+            dir (systemName) {
                 stage('Clean') {
                     _utils.beautyEcho(1, 'Clean')
-                _stage.clean_dir()
                 }
         
                 stage('Checkout') {
@@ -102,6 +101,7 @@ def call(body) {
                     _utils.beautyEcho(7, 'Clean')  
                     _stage.clean_images(imageTag)
                 }
+            }
             
         } catch (err) {
             if (imageTag) {