From 74ab8da0fda0cb2814dbc29a535a5b035469ba36 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 2 Dec 2016 11:07:22 +0000 Subject: [PATCH] Jenkins DSL: * Add some comments * Add disabled Job for IBM JDK * Enable POI-DSL-1.6, leave the others disabled for now git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1772327 13f79535-47bb-0310-9956-ffa450edef68 --- jenkins/create_jobs.groovy | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index a6c9f2610..38d840156 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -1,8 +1,10 @@ -// You can use http://job-dsl.herokuapp.com/ to validate the code before checkin +// This script is used as input to the Jenkins Job DSL plugin to create all the build-jobs that +// Apache POI uses on the public Jenkins instance at https://builds.apache.org/view/POI/ +// +// See https://github.com/jenkinsci/job-dsl-plugin/wiki for information about the DSL, you can +// use http://job-dsl.herokuapp.com/ to validate the code before checkin // -// POI-JDK-IBM: This config was not enabled in Jenkins ever because we did not find the JDK on any of the slaves, we can check this again later - def triggerSundays = ''' # only run this once per week on Sundays H H * * 0 @@ -11,28 +13,31 @@ H H * * 0 def poijobs = [ [ name: 'POI-DSL-1.6', jdks: ['1.6'] ], - [ name: 'POI-DSL-1.8', jdks: ['1.8'], trigger: 'H */12 * * *' + [ name: 'POI-DSL-1.8', jdks: ['1.8'], trigger: 'H */12 * * *', disabled: true ], - [ name: 'POI-DSL-OpenJDK', jdks: ["OpenJDK"], trigger: 'H */12 * * *' + [ name: 'POI-DSL-OpenJDK', jdks: ["OpenJDK"], trigger: 'H */12 * * *', disabled: true ], [ name: 'POI-DSL-1.9', jdks: ['1.9'], trigger: triggerSundays, properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true', '-Djava9addmods=-addmods', '-Djava9addmodsvalue=java.xml.bind', '-Djava.locale.providers=JRE,CLDR'], - email: 'centic@apache.org' + email: 'centic@apache.org', disabled: true + ], + // This config was not enabled in Jenkins ever because we did not find the JDK on any of the slaves, we can check this again later + [ name: 'POI-DSL-IBM-JDK', jdks: ['IBMJDK'], trigger: triggerSundays, noScratchpad: true, disabled: true ], [ name: 'POI-DSL-old-Xerces', jdks: ['1.6'], trigger: triggerSundays, shell: 'mkdir -p compile-lib && test -f compile-lib/xercesImpl-2.6.1.jar || wget -O compile-lib/xercesImpl-2.6.1.jar http://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesImpl-2.6.1.jar\n', // the property triggers using Xerces as XML Parser and previously showed some exception that can occur - properties: ['-Dadditionaljar=compile-lib/xercesImpl-2.6.1.jar'] + properties: ['-Dadditionaljar=compile-lib/xercesImpl-2.6.1.jar'], disabled: true ], - [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true + [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true, disabled: true ], - [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true + [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true, disabled: true ], - [ name: 'POI-DSL-API-Check', jdks: ['1.7'], trigger: '@daily', apicheck: true + [ name: 'POI-DSL-API-Check', jdks: ['1.7'], trigger: '@daily', apicheck: true, disabled: true ], - [ name: 'POI-DSL-Gradle', jdks: ['1.7'], trigger: triggerSundays, email: 'centic@apache.org', gradle: true + [ name: 'POI-DSL-Gradle', jdks: ['1.7'], trigger: triggerSundays, email: 'centic@apache.org', gradle: true, disabled: true ], - [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true + [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true, disabled: true ], ] @@ -48,6 +53,7 @@ def jdkMapping = [ '1.8': "JDK 1.8 (latest)", '1.9': "JDK 9 b142 (early access build) with project Jigsaw", "OpenJDK": "OpenJDK 6 (on Ubuntu only)", + "IBMJDK": "IBM 1.7 64-bit (on Ubuntu only)", ] poijobs.each { poijob -> @@ -58,8 +64,9 @@ poijobs.each { poijob -> jdks.each { jdkKey -> job(poijob.name) { - // for now we create the jobs in disabled state so they do not run for now - disabled() + if (poijob.disabled) { + disabled() + } description('''