Commit f730ee0e authored by wentao.suo's avatar wentao.suo

fix

parent 8631c632
...@@ -24,6 +24,7 @@ def imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp){ ...@@ -24,6 +24,7 @@ def imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp){
def imageTag4_4=[:] def imageTag4_4=[:]
imageTag4_36["harborHost"]="http://192.168.4.36" imageTag4_36["harborHost"]="http://192.168.4.36"
imageTag4_36["imageTag"] = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}" imageTag4_36["imageTag"] = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
imageTag4_4["harborHost"]="http://192.168.4.4" imageTag4_4["harborHost"]="http://192.168.4.4"
imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}" imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
...@@ -430,8 +431,9 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster, ...@@ -430,8 +431,9 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
def deploy(namespace, systemName, imageTag, tier, isDeploy) { def deploy(namespace, systemName, imageTag, tier, isDeploy) {
stage('Deploy To K8s Cluster'){ stage('Deploy To K8s Cluster'){
_utils().beautyEcho("Deploy To K8s Cluster image: ${imageTag} to:${namespace}", "info")
def deploy_job_info def deploy_job_info
if (isDeploy=="true") { if (isDeploy=="true") {
_utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info") _utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info")
update_microservice(namespace, systemName, imageTag, tier) update_microservice(namespace, systemName, imageTag, tier)
......
...@@ -79,7 +79,7 @@ def call(body) { ...@@ -79,7 +79,7 @@ def call(body) {
_stage.dockerbuild_and_push(imageTagInfo,buildNumber,_systemName,originBranchName ,cluster,timeStemp,contextDir) _stage.dockerbuild_and_push(imageTagInfo,buildNumber,_systemName,originBranchName ,cluster,timeStemp,contextDir)
_utils.beautyEcho("Deploy To K8s Cluster image: ${imageTag} to:${namespace}", "stage")
} }
_stage.deploy(namespace, _systemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy) _stage.deploy(namespace, _systemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment