This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-training.git
commit 3af71bcefa0d1e478412452dbd30463bcddbe27f Author: Christofer Dutz <[email protected]> AuthorDate: Fri Apr 26 12:33:46 2019 +0200 - Preparation for merging back to master. --- site/Jenkinsfile | 8 ++++---- tools/maven-revealjs-asciidoctor-templte/Jenkinsfile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/site/Jenkinsfile b/site/Jenkinsfile index 3f2017d..3f61ceb 100644 --- a/site/Jenkinsfile +++ b/site/Jenkinsfile @@ -106,7 +106,7 @@ pipeline { stage('Deploy site') { when { changeset "site/**" - branch 'feature/changed-directory-structure' + branch 'master' } steps { echo 'Deploying Site' @@ -121,7 +121,7 @@ pipeline { // If this build failed, send an email to the list. failure { script { - if(env.BRANCH_NAME == "develop") { + if(env.BRANCH_NAME == "master") { emailext( subject: "[Website][BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -138,7 +138,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC // If this build didn't fail, but there were failing tests, send an email to the list. unstable { script { - if(env.BRANCH_NAME == "develop") { + if(env.BRANCH_NAME == "master") { emailext( subject: "[Website][BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -158,7 +158,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC // (in this cae we probably don't have to do any post-build analysis) deleteDir() script { - if ((env.BRANCH_NAME == "develop") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { + if ((env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { emailext ( subject: "[Website][BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ diff --git a/tools/maven-revealjs-asciidoctor-templte/Jenkinsfile b/tools/maven-revealjs-asciidoctor-templte/Jenkinsfile index f28063e..a4c7c0b 100644 --- a/tools/maven-revealjs-asciidoctor-templte/Jenkinsfile +++ b/tools/maven-revealjs-asciidoctor-templte/Jenkinsfile @@ -86,7 +86,7 @@ pipeline { // If this build failed, send an email to the list. failure { script { - if(env.BRANCH_NAME == "develop") { + if(env.BRANCH_NAME == "master") { emailext( subject: "[Template][BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -103,7 +103,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC // If this build didn't fail, but there were failing tests, send an email to the list. unstable { script { - if(env.BRANCH_NAME == "develop") { + if(env.BRANCH_NAME == "master") { emailext( subject: "[Template][BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -123,7 +123,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC // (in this cae we probably don't have to do any post-build analysis) deleteDir() script { - if ((env.BRANCH_NAME == "develop") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { + if ((env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { emailext ( subject: "[Template][BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """
