ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -341,3 +341,22 @@ def getDocketPackageImage(buildType){
 }
 
 
+
+def checkAndBuild(dockerImage,dockerArgs,buildType,systemName,branchName,contextDir){
+	docker.image(dockerImage).inside(dockerArgs){
+
+		/*checkout code*/
+		_utils().beautyEcho("checkout", "info")
+		checkout(buildType, systemName, branchName)
+
+		/*prepare config*/
+		_utils).beautyEcho("prepare config", "info")
+		prepare_config(buildType, systemName, contextDir)
+
+		/*build*/
+		_utils).beautyEcho("build", "info")
+		build(config.buildType, systemName, contextDir)
+		
+	}
+}
+

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -55,7 +55,7 @@ def call(body) {
 						  def pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType)
 					    arrSystem = systemName.split("--")
 					    for (systemNameSimple in arrSystem) {
-								checkAndBuild(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"],config.buildType, systemNameSimple, branchName, contextDir)
+								_stage.checkAndBuild(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"],config.buildType, systemNameSimple, branchName, contextDir)
 							}
 							
 						}
@@ -111,24 +111,5 @@ def call(body) {
 }
 
 
-def checkAndBuild(dockerImage,dockerArgs,buildType,systemName,branchName,contextDir){
-	docker.image(dockerImage).inside(dockerArgs){
 
-		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)
-		
-	}
-}