Merge branch 'master' of git.quantgroup.cn:QA/global-jenkinsfile

src/org/qg/docker_new/StageBucket.groovy

@@ -20,14 +20,14 @@ def contextMkdir(key) {
 
 def imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp){
 	
-	def imageTag4_3=[:] 
+	def imageTag4_36=[:] 
 	def imageTag4_4=[:]
-	imageTag4_3["harborHost"]="http://192.168.4.3"
-	imageTag4_3["imageTag"] = "192.168.4.3/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
+	imageTag4_36["harborHost"]="http://192.168.4.36"
+	imageTag4_36["imageTag"] = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
 	imageTag4_4["harborHost"]="http://192.168.4.4"
 	imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
 	
-	return [ imageTag4_3,	imageTag4_4 ]
+	return [ imageTag4_36,	imageTag4_4 ]
 }
 
 def init_dependency() {    
@@ -400,7 +400,7 @@ def check_and_build(buildType,systemName,branchName,contextDir){
 def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,timeStemp,contextDir){
 	//systemName == originSystemName
 	def harbor_host = imageTagInfo["harborHost"]
-	def imageTab = imageTagInfo["imageTab"]
+	def imageTag = imageTagInfo["imageTag"]
 
 	stage('Docker Build And Push') {
 		withDockerRegistry([credentialsId: 'harbor-qajenkins', url: harbor_host]) {

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -82,7 +82,7 @@ def call(body) {
 						_utils.beautyEcho("Deploy To K8s Cluster image: ${imageTag} to:${namespace}", "stage")	
 					}
 															
-					_stage.deploy(namespace, _systemName, imageTagInfo[0]["imageTag"], config.tier, isDeploy)
+					_stage.deploy(namespace, _systemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy)
 															
 	
 				}