Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2019-06-28 18:38:21 +10:00
commit 1dc1aa59be
1 changed files with 12 additions and 8 deletions

16
Jenkinsfile vendored
View File

@ -74,7 +74,6 @@ pipeline {
} }
} }
} }
/*
post { post {
failure { failure {
slackNotif() slackNotif()
@ -86,14 +85,15 @@ pipeline {
slackNotif() slackNotif()
} }
} }
*/
} }
/*
def slackNotif() { def slackNotif() {
script { script {
if (env.BRANCH_NAME=='jetty-10.0.x' || try
env.BRANCH_NAME=='jetty-9.4.x') { {
if ( env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-9.4.x' )
{
//BUILD_USER = currentBuild.rawBuild.getCause(Cause.UserIdCause).getUserId() //BUILD_USER = currentBuild.rawBuild.getCause(Cause.UserIdCause).getUserId()
// by ${BUILD_USER} // by ${BUILD_USER}
COLOR_MAP = ['SUCCESS': 'good', 'FAILURE': 'danger', 'UNSTABLE': 'danger', 'ABORTED': 'danger'] COLOR_MAP = ['SUCCESS': 'good', 'FAILURE': 'danger', 'UNSTABLE': 'danger', 'ABORTED': 'danger']
@ -101,9 +101,13 @@ def slackNotif() {
color: COLOR_MAP[currentBuild.currentResult], color: COLOR_MAP[currentBuild.currentResult],
message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} - ${env.BUILD_URL}" message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} - ${env.BUILD_URL}"
} }
} catch (Exception e) {
e.printStackTrace()
echo "skip failure slack notification: " + e.getMessage()
} }
} }
*/ }
/** /**
* To other developers, if you are using this method above, please use the following syntax. * To other developers, if you are using this method above, please use the following syntax.