Commit 3268f819 authored by daidekun's avatar daidekun

f

parent 3f4d9384
...@@ -174,10 +174,7 @@ def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, conte ...@@ -174,10 +174,7 @@ def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, conte
} }
} }
echo "=================镜像地址=================" _utils.beautyEcho("镜像地址:${imageTag}", "info")
_utils.beautyEcho(imageTag, "info")
echo "========================================="
return imageTag return imageTag
} }
...@@ -185,7 +182,7 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) { ...@@ -185,7 +182,7 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
def deploy_job_info def deploy_job_info
if (isDeploy=="true") { if (isDeploy=="true") {
echo ("将镜像更新到到Namespace:" + namespace) _utils.beautyEcho("将镜像更新到到Namespace:" + namespace, "info")
deploy_job_info = build job: '3.deployer.Updater', parameters: [ deploy_job_info = build job: '3.deployer.Updater', parameters: [
string(name: 'namespace', value:"${namespace}"), string(name: 'namespace', value:"${namespace}"),
string(name:'name', value: "${systemName}"), string(name:'name', value: "${systemName}"),
...@@ -195,7 +192,7 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) { ...@@ -195,7 +192,7 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
log = Jenkins.getInstance().getItemByFullName('3.deployer.Updater').getBuildByNumber(deploy_job_info.getNumber()).logFile.text log = Jenkins.getInstance().getItemByFullName('3.deployer.Updater').getBuildByNumber(deploy_job_info.getNumber()).logFile.text
return log return log
}else{ }else{
echo "namespace:[${namespace}]不存在,不执行deploy" _utils.beautyEcho("namespace:[${namespace}]不存在,不执行deploy", "info")
} }
} }
......
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