Skip to content

G
global-jenkinsfile
Commit 2113001b authored by kalvin's avatar kalvin
Browse files
Options

fix json bugs

parent 67a27eef
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/org/qg/docker/StageBucket.groovy
View file @ 2113001b
...@@ -227,9 +227,8 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa ...@@ -227,9 +227,8 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
k8sSystemName = systemName.replaceAll("_","-") k8sSystemName = systemName.replaceAll("_","-")
safeBranchName = branchName.replaceAll(regex,"_") safeBranchName = branchName.replaceAll(regex,"_")
defaultSystemName = "project" defaultSystemName = "project"
timeStemp = new Date().format("yyyyMMddHHmmss")
timeStemp = new Date().format("yyyyMMddHHmmss")
imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}" imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
...@@ -297,7 +296,7 @@ def project_attr(systemName) { ...@@ -297,7 +296,7 @@ def project_attr(systemName) {
def update_microservice(namespace, name, image, tier) { def update_microservice(namespace, name, image, tier) {
dest_url = "http://192.168.4.24/api/qahome/update_microservice" dest_url = "http://192.168.4.24/api/qahome/update_microservice"
json_str = '{"namespace":' + namespace + ',"name":' + name + ',"image":'+ image +',"tier":' + tier + '}' json_str = '{"namespace":"' + namespace + '","name":"' + name + '","image":"'+ image +'","tier":"' + tier + '"}'
echo json_str echo json_str
j = readJSON text:json_str j = readJSON text:json_str
......
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