This is an automated email from the ASF dual-hosted git repository. taybou pushed a commit to branch UNOMI-426-doc in repository https://gitbox.apache.org/repos/asf/unomi.git
commit fcae014575c82ff178468ae23b0d9975bdfdd175 Author: Taybou <[email protected]> AuthorDate: Mon Feb 8 12:21:44 2021 +0100 UNOMI-426 remove unneeded stages in Jenkinsfile-jdk11 --- Jenkinsfile | 18 +++++++----------- Jenkinsfile-jdk11 | 36 ++++-------------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e777517..d77232b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,11 +21,7 @@ pipeline { - agent { - node { - label 'ubuntu' - } - } + agent any environment { // ... setup any environment variables ... @@ -99,19 +95,19 @@ pipeline { stage('Generate doc') { when { expression { - env.BRANCH_NAME ==~ /(1.4.x|1.5.x|master)/ + env.BRANCH_NAME ==~ /(unomi-1.4.x|unomi-1.5.x|master)/ } } steps { echo 'Generate documentation' - sh 'mvn javadoc:aggregate source:aggregate -Pdocs' + sh 'mvn javadoc:aggregate source:aggregate' } } stage('Deploy') { when { expression { - env.BRANCH_NAME ==~ /(1.4.x|1.5.x|master)/ + env.BRANCH_NAME ==~ /(unomi-1.4.x|unomi-1.5.x|master)/ } } steps { @@ -126,7 +122,7 @@ pipeline { // If this build failed, send an email to the list. failure { script { - if(env.BRANCH_NAME == "1.4.x" || env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "master") { + if(env.BRANCH_NAME == "unomi-1.4.x" || env.BRANCH_NAME == "unomi-1.5.x" || env.BRANCH_NAME == "master") { emailext( subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -143,7 +139,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 == "1.4.x" || env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "master") { + if(env.BRANCH_NAME == "unomi-1.4.x" || env.BRANCH_NAME == "unomi-1.5.x" || env.BRANCH_NAME == "master") { emailext( subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -163,7 +159,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 == "1.4.x" || env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { + if ((env.BRANCH_NAME == "unomi-1.4.x" || env.BRANCH_NAME == "unomi-1.5.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { emailext ( subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ diff --git a/Jenkinsfile-jdk11 b/Jenkinsfile-jdk11 index dd3f5d2..4ddfa3c 100644 --- a/Jenkinsfile-jdk11 +++ b/Jenkinsfile-jdk11 @@ -21,11 +21,7 @@ pipeline { - agent { - node { - label 'ubuntu' - } - } + agent any environment { // ... setup any environment variables ... @@ -95,30 +91,6 @@ pipeline { sh 'mvn -pl itests clean install -Pintegration-tests' } } - - stage('Generate doc') { - when { - expression { - env.BRANCH_NAME ==~ /(1.4.x|1.5.x|master)/ - } - } - steps { - echo 'Generate documentation' - sh 'mvn javadoc:aggregate source:aggregate -Pdocs' - } - } - - stage('Deploy') { - when { - expression { - env.BRANCH_NAME ==~ /(1.4.x|1.5.x|master)/ - } - } - steps { - echo 'Deploying' - sh 'mvn deploy -DskipTests' - } - } } // Do any post build stuff ... such as sending emails depending on the overall build result. @@ -126,7 +98,7 @@ pipeline { // If this build failed, send an email to the list. failure { script { - if(env.BRANCH_NAME == "1.4.x" || env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "master") { + if(env.BRANCH_NAME == "unomi-1.4.x" || env.BRANCH_NAME == "unomi-1.5.x" || env.BRANCH_NAME == "master") { emailext( subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -143,7 +115,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 == "1.4.x" || env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "master") { + if(env.BRANCH_NAME == "unomi-1.4.x" || env.BRANCH_NAME == "unomi-1.5.x" || env.BRANCH_NAME == "master") { emailext( subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -163,7 +135,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 == "1.4.x" || env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { + if ((env.BRANCH_NAME == "unomi-1.4.x" || env.BRANCH_NAME == "unomi-1.5.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { emailext ( subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """
