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

change 4.36 to 4.4

parent 28c3d296
...@@ -233,7 +233,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa ...@@ -233,7 +233,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}" imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
withDockerServer([uri: "tcp://192.168.4.96:2375/"]) { withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) { withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.4"]) {
def build_schema = "BUILD_TIME:${timeNow}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}" def build_schema = "BUILD_TIME:${timeNow}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}"
echo build_schema echo build_schema
......
...@@ -19,7 +19,7 @@ def contextMkdir(key) { ...@@ -19,7 +19,7 @@ def contextMkdir(key) {
} }
def imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp){ def imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp){
return "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}" return "192.168.4.4/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
} }
def init_dependency() { def init_dependency() {
...@@ -392,7 +392,7 @@ def check_and_build(buildType,systemName,branchName,contextDir){ ...@@ -392,7 +392,7 @@ def check_and_build(buildType,systemName,branchName,contextDir){
def dockerbuild_and_push(imageTag,buildNumber,systemName,branchName,cluster,timeStemp,contextDir){ def dockerbuild_and_push(imageTag,buildNumber,systemName,branchName,cluster,timeStemp,contextDir){
//systemName == originSystemName //systemName == originSystemName
stage('Docker Build And Push') { stage('Docker Build And Push') {
withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.3"]) { withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.4"]) {
def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}" def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}"
echo build_schema echo build_schema
def args = "" def args = ""
......
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