Commit f8cf015d authored by kalvin's avatar kalvin

tools 增加新deploy方式

parent c074f84d
...@@ -47,18 +47,16 @@ def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, conte ...@@ -47,18 +47,16 @@ def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, conte
return imageTag return imageTag
} }
def deploy(namespace, systemName, imageTag, tier) { def deploy(namespace, systemName, imageTag, tier, isDeploy) {
def deploy_job_info def deploy_job_info
_utils().beautyEcho("将镜像更新到到Namespace:" + namespace, "info") if (isDeploy=="true") {
deploy_job_info = build job: '3.deployer.Updater', parameters: [ _utils().beautyEcho("[新集群][deploy]将镜像更新到到Namespace:" + namespace, "info")
string(name: 'namespace', value: namespace), log = update_microservice(namespace, systemName, imageTag, tier)
string(name:'name', value: "${systemName}"), return log
string(name:'image', value: "${imageTag}"), }else{
string(name:'tier', value: "tools")] _utils().beautyEcho("namespace:[${namespace}]不存在,不执行deploy", "info")
}
log = Jenkins.getInstance().getItemByFullName('3.deployer.Updater').getBuildByNumber(deploy_job_info.getNumber()).logFile.text
return log
} }
def clean_images(imageTag) { def clean_images(imageTag) {
...@@ -68,4 +66,23 @@ def clean_images(imageTag) { ...@@ -68,4 +66,23 @@ def clean_images(imageTag) {
@NonCPS @NonCPS
def jsonParse(def json) { def jsonParse(def json) {
new groovy.json.JsonSlurperClassic().parseText(json) new groovy.json.JsonSlurperClassic().parseText(json)
} }
\ No newline at end of file
def update_microservice(namespace, name, image, tier) {
dest_url = "http://192.168.6.13/api/qahome/update_microservice"
response = httpRequest httpMode:"PUT",
consoleLogResponseBody:true,
contentType:"APPLICATION_JSON",
requestBody:"""{
"namespace":"${namespace}",
"name":"${name}",
"image":"${image}",
"tier":"${tier}"
}""",
url:dest_url
def res_json = jsonParse(response.content)
return res_json
}
...@@ -79,7 +79,7 @@ def call(body) { ...@@ -79,7 +79,7 @@ def call(body) {
stage('Deploy To K8s Cluster') { stage('Deploy To K8s Cluster') {
_utils.beautyEcho("Deploy To K8s Cluster", "stage") _utils.beautyEcho("Deploy To K8s Cluster", "stage")
def deploy_log = _stage.deployV2(namespace, systemName, imageTag, config.tier) def deploy_log = _stage.deploy(namespace, systemName, imageTag, config.tier)
_utils.beautyEcho(deploy_log, "info") _utils.beautyEcho(deploy_log, "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