fffff

4efa932d · wentao.suo · fa690a4e · 4efa932d · 4efa932d
Commit 4efa932d authored Apr 09, 2018 by wentao.suo
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

StageBucket.groovy src/org/qg/docker_new/StageBucket.groovy +1 -1

qgDockerPiplineWithDockerSlave.groovy vars/qgDockerPiplineWithDockerSlave.groovy +2 -2

No files found.
--- a/src/org/qg/docker_new/StageBucket.groovy
+++ b/src/org/qg/docker_new/StageBucket.groovy
@@ -369,7 +369,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
 	}
 }

-def dockerMake(buildNumber,systemName,branchName,cluster,timeStemp){
+def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){
 	
  
 	withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {

--- a/vars/qgDockerPiplineWithDockerSlave.groovy
+++ b/vars/qgDockerPiplineWithDockerSlave.groovy
@@ -65,8 +65,8 @@ def call(body) {
 						_utils.beautyEcho("build over", "info")				
 						stage('make docker image') {
 							_utils.beautyEcho("make docker image", "stage")		
-							imageTag = imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)	
-							_stage.dockerMake(buildNumber,systemName,branchName,cluster,timeStemp)
+							imageTag = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)	
+							_stage.dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp)
 								
 						}