ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -369,3 +369,22 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
 	}
 }
 
+def dockerMake(buildNumber,systemName,branchName,cluster,harborGroup,k8sSystemName,safeBranchName,timeStemp){
+	imageTag = imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
+  
+	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 image = docker.build(imageTag, "--build-arg BUILD_SCHEMA=${build_schema} ${contextDir}")
+    image.push()
+
+    if (branchName == "master" || branchName == "master--master") {
+      image.push('latest')
+    }
+
+  }
+
+
+}
+

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -65,20 +65,7 @@ def call(body) {
 						_utils.beautyEcho("build over", "info")				
 						stage('make docker image') {
 							_utils.beautyEcho("make docker image", "stage")			
-							imageTag = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
-						  
-							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 image = docker.build(imageTag, "--build-arg BUILD_SCHEMA=${build_schema} ${contextDir}")
-				        image.push()
-      
-				        if (branchName == "master" || branchName == "master--master") {
-			            image.push('latest')
-				        }
-          
-					    }
+							_stage.dockerMake(buildNumber,systemName,branchName,cluster,harborGroup,k8sSystemName,safeBranchName,timeStemp)
 								
 						}