Commit 28c3d296 authored by wentao.suo's avatar wentao.suo

chang 4.36 to 4.4

parent 67fb3f1c
...@@ -286,19 +286,19 @@ def slaveImageRespority(buildEnv){ ...@@ -286,19 +286,19 @@ def slaveImageRespority(buildEnv){
switch(buildEnv){ switch(buildEnv){
case "java8": case "java8":
return "192.168.4.36/baseimg/docker-jenkins-slave:2018041202" return "192.168.4.4/baseimg/docker-jenkins-slave:2018041202"
break break
case "java9": case "java9":
return null return null
break break
case "node7": case "node7":
return "192.168.4.36/baseimg/jenkins-node7-slave:2018041301" return "192.168.4.4/baseimg/jenkins-node7-slave:2018041301"
break break
case "node8": case "node8":
return "192.168.4.36/baseimg/jenkins-node8-slave:2018041301" return "192.168.4.4/baseimg/jenkins-node8-slave:2018041301"
break break
default : default :
return "192.168.4.36/baseimg/docker-jenkins-slave:2018041202" return "192.168.4.4/baseimg/docker-jenkins-slave:2018041202"
} }
} }
...@@ -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.36"]) { withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.3"]) {
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