fix

src/org/qg/docker_new/StageBucket.groovy

@@ -265,49 +265,69 @@ def update_microservice(namespace, name, image, tier) {
     return res_json
 }
 
-def getDocketPackageImage(buildType){
-	echo "getDocketPackageImage :${buildType}"
-	def args = ""
-	def packageImageInfo=[:] 
 
-	packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041202"
+def slaveImageRespority(buildEnv){
+	//envType java8 java9 node7 node8
+	
+	switch(envType){
+		catch "java8":
+			return "192.168.4.36/baseimg/docker-jenkins-slave:2018041202"
+			break
+		catch "java9":
+			return null 
+			break
+		catch "node7":
+	    return "192.168.4.36/baseimg/jenkins-node7-slave:2018041301"
+			break
+		catch "node8":
+			return "192.168.4.36/baseimg/jenkins-node8-slave:2018041301"
+			break
+		default :
+			return "192.168.4.36/baseimg/docker-jenkins-slave:2018041202"
+		}
+	
+}
+
+def slaveImageArgs(buildType){
+	def args = ""
 	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/package/:/home/quant_group/package/ "
 	switch (buildType) {
 		case "java":
 			args += "-v /root/.m2:/root/.m2 "			
-			
-			packageImageInfo["args"] = args
 			break
 			
 		case "nodejs":
 			args += "-v /root/.npm:/root/.npm:rw "
 			args += "-v /root/.cache:/root/.cache:rw "
 			args += "-v /root/.node-gyp:/root/.node-gyp:rw "
-			packageImageInfo["args"] = args
 			break			
-			
 		case "python":		
-			packageImageInfo["args"] = ""
 			break
 			
 		case "lua-ui":
 			args += "-v /root/.npm:/root/.npm:rw "
 			args += "-v /root/.cache:/root/.cache:rw "
 			args += "-v /root/.node-gyp:/root/.node-gyp:rw "			
-					
-			packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041204"
-			packageImageInfo["args"] = args		
 			break
 			
 		default:			
-			echo ""
-			_utils() .beautyEcho("未知的buildType: ${buildType}", "info")
-			packageImageInfo["image"] = ""
-			packageImageInfo["args"] = ""
 			break
 	}
+	
+	return args
+	
+}
+
+def getDocketPackageImage(buildType,buildEnv){
+	echo "getDocketPackageImage :${buildType}"
+
+	def packageImageInfo=[:] 
+	
+	packageImageInfo["image"] = slaveImageRespority(buildEnv)
+	packageImageInfo["args"] = slaveImageArgs(buildType)
+	
 	_utils().beautyEcho("image :"+ packageImageInfo["image"], "info")
 	_utils().beautyEcho("args :"+ packageImageInfo["args"], "info")
 	return packageImageInfo
@@ -315,6 +335,21 @@ def getDocketPackageImage(buildType){
 
 def check_and_build(buildType,systemName,branchName,contextDir){
 	
+	def buildEnv =""
+	switch(buildType){
+		case "java"
+			buildEnv ="java8"
+			break
+		case "lua-ui"
+			buildEnv = "node8"
+			if(systemName=="xyqb-ui"){
+				buildEnv ="node7"
+			}
+			break
+		default :
+			buildEnv ="java8"
+	}
+	
 	def pacegeDockerInfo = getDocketPackageImage(buildType)
 	
 	docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){
@@ -332,9 +367,6 @@ def check_and_build(buildType,systemName,branchName,contextDir){
 			build(buildType, systemName, contextDir)
 		}
 			
-		
-		
-		
 	}
 }
 
@@ -342,7 +374,6 @@ def dockerbuild_and_push(imageTag,buildNumber,systemName,branchName,cluster,time
 	//systemName == originSystemName
 	stage('Docker Build And Push') {
 		withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
-
 			def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}"
 			echo build_schema
 			def args = ""

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -81,7 +81,6 @@ def call(body) {
 					_stage.deploy(namespace, _systemName, imageTag, config.tier, isDeploy)
 															
 	
-						
 				}
 	
 				/*  4 */
@@ -96,6 +95,7 @@ def call(body) {
 				throw err			
 			}
 	    }
+		
 	}
 }