Commit 61c85712 authored by kewei.jia's avatar kewei.jia

修改 dingtalk参数

parent b533857a
...@@ -591,7 +591,7 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,timeStem ...@@ -591,7 +591,7 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,timeStem
// set_image_info(systemName, branchHashCode, imageTag) // set_image_info(systemName, branchHashCode, imageTag)
} }
def ding_talk_back(buildNumber,flags,image,cluster,tier) { def ding_talk_back(buildNumber,flags,image,cluster,tier,systemName) {
image = image.replaceAll("ccr.ccs.tencentyun.com/","") image = image.replaceAll("ccr.ccs.tencentyun.com/","")
def projectAttr = project_attr(systemName) def projectAttr = project_attr(systemName)
def host = projectAttr["host"] def host = projectAttr["host"]
......
...@@ -80,7 +80,7 @@ def call(body) { ...@@ -80,7 +80,7 @@ def call(body) {
for (imageTagInfo in imageTagInfos){ for (imageTagInfo in imageTagInfos){
_stage.dockerbuild_and_push(imageTagInfo,buildNumber,originSystemName,originBranchName,timeStemp,contextDir,branchHashCode,config.buildType) _stage.dockerbuild_and_push(imageTagInfo,buildNumber,originSystemName,originBranchName,timeStemp,contextDir,branchHashCode,config.buildType)
} }
_stage.deploy(namespace, originSystemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy, cluster) _stage.deploy(namespace, originSystemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy, cluster,originSystemName)
} }
/* 4 */ /* 4 */
...@@ -95,6 +95,7 @@ def call(body) { ...@@ -95,6 +95,7 @@ def call(body) {
} catch (err) { } catch (err) {
_utils.beautyEcho(err, "fail") _utils.beautyEcho(err, "fail")
_stage.ding_talk(buildNumber,"fail") _stage.ding_talk(buildNumber,"fail")
_stage.deploy(namespace, originSystemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy, cluster,originSystemName)
if(imageTagInfos != null){ if(imageTagInfos != null){
_stage.clean_images(imageTagInfos[0]["imageTag"],contextDir,config.buildType) _stage.clean_images(imageTagInfos[0]["imageTag"],contextDir,config.buildType)
} }
......
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