fff

src/org/qg/docker_new/StageBucket.groovy

@@ -133,10 +133,10 @@ def checkout_nodejs(systemName, branchName) {
 }
 
 def checkout_luaui(systemNames, branchNames) {
-	  _utils().beautyEcho("checkout_lua_ui :" + systemNames, "info")
+	  
 		sh "cp -rf /home/quant_group/config_repository/lua-ui/npmrc/npmrc /root/.npmrc"
     if(systemNames.contains("--")){
-				_utils().beautyEcho("complex ui projects :" + systemNames, "info")
+				_utils().beautyEcho("complex ui projects : ${systemNames}"  , "info")
         t1 = systemNames.split("/")
         
         projects = t1[1].split("--")
@@ -172,7 +172,7 @@ def checkout_luaui(systemNames, branchNames) {
         }
     }
     else{
-				_utils().beautyEcho("simple ui project :" + systemNames, "info")
+				_utils().beautyEcho("simple ui project : ${systemNames}"  , "info")
         def systemName = systemNames
 				def  branchName = branchNames
         
@@ -343,27 +343,25 @@ def update_microservice(namespace, name, image, tier) {
     return res_json
 }
 
-
-
 def getDocketPackageImage(buildType){
 	echo "getDocketPackageImage :${buildType}"
+	def args =""
 	def packageImageInfo=[:] 
+	
+	args +="-v /home/quant_group/qg-dockerfiles:/home/quant_group/qg-dockerfiles "
+	args +="-v /home/quant_group/config_repository:/home/quant_group/config_repository "
+	args +="-v /home/quant_group/pacakge/:/home/quant_group/pacakge/ "
 	switch (buildType) {
 		case "java":
-			def args = "-v /root/.m2:/root/.m2 "
-			args +="-v /home/quant_group/qg-dockerfiles:/home/quant_group/qg-dockerfiles "
-			args +="-v /home/quant_group/config_repository:/home/quant_group/config_repository "
-			args +="-v /home/quant_group/pacakge/:/home/quant_group/pacakge/ "
+			args += "-v /root/.m2:/root/.m2 "
 			
 			packageImageInfo["image"] = "192.168.4.36/baseimg/jenkins-slave:2018040302"
 			packageImageInfo["args"] = args
 			break
 		case "nodejs":
-			def args = "-v /root/.npm:/root/.npm "
+			args += "-v /root/.npm:/root/.npm "
 			args +="-v /root/.cache:/root/.cache "
-			args +="-v /home/quant_group/qg-dockerfiles:/home/quant_group/qg-dockerfiles "
-			args +="-v /home/quant_group/config_repository:/home/quant_group/config_repository "
-			args +="-v /home/quant_group/pacakge/:/home/quant_group/pacakge/ "
+			
 			packageImageInfo["image"] = "192.168.4.36/baseimg/jenkins-node-slave:2018040402"
 			packageImageInfo["args"] = ""
 			break
@@ -372,11 +370,9 @@ def getDocketPackageImage(buildType){
 			packageImageInfo["args"] = ""
 			break
 		case "lua-ui":
-			def args = "-v /root/.npm:/root/.npm "
+			args += "-v /root/.npm:/root/.npm "
 			args +="-v /root/.cache:/root/.cache "
-			args +="-v /home/quant_group/qg-dockerfiles:/home/quant_group/qg-dockerfiles "
-			args +="-v /home/quant_group/config_repository:/home/quant_group/config_repository "
-			args +="-v /home/quant_group/pacakge/:/home/quant_group/pacakge/ "
+			
 			packageImageInfo["image"] = "192.168.4.36/baseimg/jenkins-node-slave:2018040402"
 			packageImageInfo["args"] = args
 			break