ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -82,14 +82,13 @@ def prepare_python(systemName, contextDir) {
 
 def checkout(buildType,systemName, branchName) {
 	
-	def projectAttr = project_attr(systemName)
-	def gitPath =projectAttr["gitPath"]
+	
 	switch(buildType){
 		case "java":
-			build_java(gitPath, branchName)
+			build_java(systemName, branchName)
 			break                  
 		case  "nodejs":
-			build_nodejs(gitPath, branchName)
+			build_nodejs(systemName, branchName)
 			break
 		case "python":
 			build_python(gitPath, branchName)
@@ -103,13 +102,15 @@ def checkout(buildType,systemName, branchName) {
 	}
 }
 
-def checkout_java(gitPath, branchName) {
+def checkout_java(systemName, branchName) {
+	def projectAttr = project_attr(systemName)
+	def gitPath =projectAttr["gitPath"]
 	git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
 }
 
-
-def checkout_nodejs(gitPth, branchName) {
-    
+def checkout_nodejs(systemName, branchName) {
+		def projectAttr = project_attr(systemName)
+		def gitPath =projectAttr["gitPath"]
 		currentPath = sh (
 		    script: 'pwd',
 		    returnStdout: true
@@ -132,12 +133,12 @@ def checkout_nodejs(gitPth, branchName) {
     }
 }
 
-def checkout_lua_ui(gitPaths, branchName) {
-    if(gitPaths.contains("--")){
-        t1 = gitPths.split("/")
-        groups = t1[0].split("--")
+def checkout_lua_ui(systemNames, branchNames) {
+    if(systemNames.contains("--")){
+        t1 = systemNames.split("/")
+        
         projects = t1[1].split("--")
-        branches = branchName.split("--")
+        branches = branchNames.split("--")
 
         t1.size().times {
 
@@ -169,11 +170,10 @@ def checkout_lua_ui(gitPaths, branchName) {
         }
     }
     else{
-        t1 = gitRepo.split("/")
-        project = t1[1]
-        
-        dir (project) {
-            projectAttr = project_attr(project)
+        def systemName = systemNames
+				def  branchName = branchNames
+        dir (systemName) {
+            projectAttr = project_attr(systemName)
             gitPath = projectAttr["gitPath"]
             
 						currentPath = sh (
@@ -223,14 +223,13 @@ def build(buildType,systemName, contextDir){
 		
 }
 
-
 def build_java(systemName, contextDir) {
 	  def res_json = project_attr(systemName)
 		
 		buildCmd = res_json["buildCmd"]
 		jarFilePath = project_attr["jarFilePath"]
     
-		sh "${buildCmd}"
+		sh buildCmd
 		sh "cp ${jarFilePath}/*.jar ${contextDir}/app.jar"
 }