fffff

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -53,26 +53,15 @@ def call(body) {
 						stage('checkout & build') {
 							_utils.beautyEcho("checkout & build", "stage")
 						  def pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType)
-							
-							docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){
-
-								def project_attr = _stage.project_attr(systemName)
-								def gitPath = project_attr["gitPath"]
-
-								/*checkout code*/
-								_utils.beautyEcho("checkout", "info")
-								_stage.checkout(config.buildType, systemName, branchName)
-
-								/*prepare config*/
-								_utils.beautyEcho("prepare config", "info")
-								_stage.prepare_config(config.buildType, systemName, contextDir)
-				
-								/*build*/
-								_utils.beautyEcho("build", "info")
-								_stage.build(config.buildType, systemName, contextDir)
-								
+					    arrSystem = systemName.split("--")
+					    for (systemNameSimple in arrSystem) {
+								checkAndBuild(config.buildType, systemNameSimple, branchName, contextDir)
 							}
+							
 						}
+					}
+					
+					withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
 						_utils.beautyEcho("build over", "info")				
 						stage('make docker image') {
 							_utils.beautyEcho("make docker image", "stage")			
@@ -121,3 +110,25 @@ def call(body) {
 		}
 }
 
+
+def checkAndBuild(buildType,systemName,branchName,contextDir){
+	docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){
+
+		def project_attr = _stage.project_attr(systemName)
+		def gitPath = project_attr["gitPath"]
+
+		/*checkout code*/
+		_utils.beautyEcho("checkout", "info")
+		_stage.checkout(buildType, systemName, branchName)
+
+		/*prepare config*/
+		_utils.beautyEcho("prepare config", "info")
+		_stage.prepare_config(buildType, systemName, contextDir)
+
+		/*build*/
+		_utils.beautyEcho("build", "info")
+		_stage.build(config.buildType, systemName, contextDir)
+		
+	}
+}
+