yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit aa9a41d678b32c838ea65f1d95597d545df6e6a0 1 parent 1fbfd645

fix pipeline

Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
... ... @@ -59,7 +59,7 @@ pipeline {
echo "ending build push ${params.deployName}......"
if(params.callBack!='noNeedDeploy'){
build job: 'Docker-Image-Deplopy', parameters: [
string(name: 'callBack', value: "auto"),
string(name: 'callBack', value: "noNeedCallBack"),
string(name: 'clusterId', value: "${params.clusterId}"),
string(name: 'serviceName', value: "${params.deployName}"),
string(name: 'containerName', value: "${params.deployName}"),
... ... @@ -78,7 +78,7 @@ pipeline {
deleteDir() /* clean up our workspace */
println "###############################"
if(params.callBack!='noNeedCallBack'){
sh "curl '${callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
sh "curl '${params.callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
}
mail to: "${env.QA_EMAIL},${params.userMail}",
subject: "PineLine '${JOB_NAME}' (${BUILD_NUMBER}),构建结果： ${currentBuild.currentResult}",
... ...
... ... @@ -75,7 +75,7 @@ pipeline {
echo "clean up our workspace,and send to callBack"
deleteDir() /* clean up our workspace */
if(params.callBack!='noNeedCallBack'){
sh "curl '${callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
sh "curl '${params.callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
}
}
}
... ...
... ... @@ -29,7 +29,8 @@ pipeline {
stages {
stage('download package script and check params') {
steps {
echo "starting triger ticketID ${params.ticketID}......"
echo "starting triger ticketID ${params.callBack}......"
echo "starting triger ticketID ${params.clusterId}......"
echo "starting triger projectName ${params.projectName}......"
echo "starting triger projectGitGroup ${params.projectGitGroup}......"
echo "starting triger deployName ${params.deployName}......"
... ... @@ -92,7 +93,7 @@ pipeline {
echo "begin send build the deploy job"
if(params.callBack!='noNeedDeploy'){
build job: 'Docker-Image-Deplopy', parameters: [
string(name: 'callBack', value: "auto"),
string(name: 'callBack', value: "noNeedCallBack"),
string(name: 'clusterId', value: "${params.clusterId}"),
string(name: 'serviceName', value: "${params.deployName}"),
string(name: 'containerName', value: "${params.deployName}"),
... ... @@ -112,7 +113,7 @@ pipeline {
subject: "PineLine '${JOB_NAME}' (${BUILD_NUMBER}),构建结果： ${currentBuild.currentResult}",
body: "构建的内容为：${params.projectName},提交人员：${params.userMail}"
if(params.callBack!='noNeedCallBack'){
sh "curl '${callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
sh "curl '${params.callBack}&status=${currentBuild.currentResult}&jobId=${JOB_NAME},${BUILD_NUMBER}'"
}
deleteDir() /* clean up our workspace */
}
... ...