ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -112,23 +112,25 @@ def checkout_nodejs(systemName, branchName) {
 	def projectAttr = project_attr(systemName)
 	def gitPath =projectAttr["gitPath"]
 	
-		/*currentPath = sh (
+	currentPath = sh (
 	    script: 'pwd',
 	    returnStdout: true
 	).trim()
-    def folder = new File( "${currentPath}/.git/hooks" )*/
-    
-    sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
-    sh "chmod +x .git/hooks/post-merge"
+  def folder = new File( "${currentPath}/.git/hooks" )
     		
+	if( !folder.exists(){
     git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
-		
     def bowerFile = fileExists './bower.json'
-
     if (bowerFile) {
         sh "bower install --allow-root"
     }
     sh "npm install"
+	} else{
+    sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
+    sh "chmod +x .git/hooks/post-merge"
+    git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
+		    
+	}
     
 }
 
@@ -139,14 +141,19 @@ def checkout_luaui(systemName, branchName) {
 	_utils().beautyEcho("ui project : ${systemName}"  , "info")
 	projectAttr = project_attr(systemName)
 	gitPath = projectAttr["gitPath"]
-
-	/*currentPath = sh (
+	currentPath = sh (
 	  script: 'pwd',
 	  returnStdout: true
 	).trim()
-
-	def folder = new File( "${currentPath}/.git/hooks" )*/
-
+	def folder = new File( "${currentPath}/.git/hooks" )
+	if( !folder.exists(){
+    git branch: branches[it], credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath    
+    def bowerFile = fileExists './bower.json'
+    if (bowerFile) {
+        sh "bower install --allow-root"
+    }
+    sh "npm install"
+	} else{
 		sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
 		sh "chmod +x .git/hooks/post-merge"
 
@@ -158,6 +165,10 @@ def checkout_luaui(systemName, branchName) {
 		}
 		sh "npm install"  
 	
+	}
+
+	         
+        
     
 }