diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index e1f9e29ae0..a3ac717d4b 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -1,16 +1,12 @@
// You can use http://job-dsl.herokuapp.com/ to validate the code before checkin
//
-// Missing configs:
-//
-// POI-JDK-IBM: Disabled, did not find the JDK on any of the slaves, need to check this again later
+// 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
-/* Missing configs:
-Erfolgreich 20% Build planen für POI-API-Check
-Erfolgreich 100% Build planen für POI-Gradle
-Erfolgreich 100% Build planen für POI-Maven
-Erfolgreich 100% Build planen für POI-regenerate-javadoc
-*/
+def triggerSundays = '''
+# only run this once per week on Sundays
+H H * * 0
+'''
def poijobs = [
[
@@ -27,40 +23,55 @@ def poijobs = [
jdks: ["OpenJDK"],
trigger: 'H */12 * * *'
],
- /* Properties do not work?!
[
name: 'POI-DSL-1.9',
jdks: ["1.9"],
- trigger: '# only run this once per week on Sundays\n' +
- 'H H * * 0',
- properties: 'maxpermsize=-Dthis.is.a.dummy=true\n' +
- 'java9addmods=-addmods\n' +
- 'java9addmodsvalue=java.xml.bind\n' +
- 'java.locale.providers=JRE,CLDR',
+ trigger: triggerSundays,
+ properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true', '-Djava9addmods=-addmods', '-Djava9addmodsvalue=java.xml.bind', '-Djava.locale.providers=JRE,CLDR'],
email: 'centic@apache.org'
- ],*/
- /* Properties do not work?!
+ ],
[
name: 'POI-DSL-old-Xerces',
jdks: ["1.9"],
- trigger: '# only run this once per week on Sundays\n' +
- 'H H * * 0',
- 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',
- properties: '# this triggers using Xerces as XML Parser and previously showed some exception that can occur\n' +
- 'additionaljar=compile-lib/xercesImpl-2.6.1.jar'
- ],*/
- /* Not finished yet
+ 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']
+ ],
[
- name: 'POI-DSL-no-scratchpad',
- trigger: '# only run this once per week on Sundays\n' +
- 'H H * * 0',
- ],*/
+ name: 'POI-DSL-Maven',
+ trigger: 'H */4 * * *',
+ maven: true
+ ],
+ [
+ name: 'POI-DSL-regenerate-javadoc',
+ trigger: triggerSundays,
+ javadoc: true
+ ],
+ [
+ name: 'POI-DSL-API-Check',
+ trigger: '@daily',
+ apicheck: true
+ ],
+ [
+ name: 'POI-DSL-Gradle',
+ jdks: ["1.7"],
+ trigger: triggerSundays,
+ email: 'centic@apache.org',
+ gradle: true
+ ],
+ [
+ name: 'POI-DSL-no-scratchpad',
+ trigger: triggerSundays,
+ noScratchpad: true
+ ],
]
def svnBase = "https://svn.apache.org/repos/asf/poi/trunk"
def defaultJdks = ["1.6"]
def defaultTrigger = 'H/15 * * * *'
def defaultEmail = 'dev@poi.apache.org'
+def defaultAnt = 'Ant (latest)'
def jdkMapping = [
"1.6": "JDK 1.6 (latest)",
@@ -71,104 +82,196 @@ def jdkMapping = [
]
poijobs.each { poijob ->
-
- def jdks = poijob.jdks ?: defaultJdks
- def trigger = poijob.trigger ?: defaultTrigger
- def email = poijob.email ?: defaultEmail
+
+ def jdks = poijob.jdks ?: defaultJdks
+ def trigger = poijob.trigger ?: defaultTrigger
+ def email = poijob.email ?: defaultEmail
- jdks.each { jdkKey ->
- job(poijob.name) {
- // for now we create the jobs in disabled state so they do not run for now
- disabled()
-
- description('
\n' +
- '
\n' + - 'Apache POI - the Java API for Microsoft Documents\n' + - '
\n' + - '\n' + - ' This is an automatically generated Job Config, do not edit it here!\n' + - ' Instead change the Jenkins Job DSL at http://svn.apache.org/repos/asf/poi/trunk/jenkins,\n' + - ' see https://github.com/jenkinsci/job-dsl-plugin/wiki\n' + - ' for more details about the DSL.\n' + - '
\n' + - '\n' + - ' Findbugs report of latest build -\n' + - ' Sonar reports -\n' + - ' Coverage of latest build\n' + - '
\n') - logRotator { - numToKeep(5) - artifactNumToKeep(1) - } - label('ubuntu&&!cloud-slave') - environmentVariables { - env('LANG', 'en_US.UTF-8') - } - wrappers { - timeout { - absolute(180) - abortBuild() - writeDescription('Build was aborted due to timeout') + jdks.each { jdkKey -> + job(poijob.name) { + // for now we create the jobs in disabled state so they do not run for now + disabled() + + description(''' +
++Apache POI - the Java API for Microsoft Documents +
++ This is an automatically generated Job Config, do not edit it here! + Instead change the Jenkins Job DSL at http://svn.apache.org/repos/asf/poi/trunk/jenkins, + see https://github.com/jenkinsci/job-dsl-plugin/wiki + for more details about the DSL. +
++ Findbugs report of latest build - + Sonar reports - + Coverage of latest build +
+''') + logRotator { + numToKeep(5) + artifactNumToKeep(1) + } + label('ubuntu&&!cloud-slave') + environmentVariables { + env('LANG', 'en_US.UTF-8') + } + wrappers { + timeout { + absolute(180) + abortBuild() + writeDescription('Build was aborted due to timeout') + } + } + jdk(jdkMapping.get(jdkKey)) + scm { + svn(svnBase) { svnNode -> + svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / + url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' + } + } + triggers { + scm(trigger) + } + + def shellcmds = '# show which files are currently modified in the working copy\n' + + 'svn status\n' + + '\n' + + 'echo $JAVA_HOME\n' + + 'ls -al $JAVA_HOME\n' + + '\n' + + (poijob.shell ?: '') + '\n' + + '# ignore any error message\n' + + 'exit 0\n' + + // Create steps and publishers depending on the type of Job that is selected + if(poijob.maven) { + steps { + shell(shellcmds) + maven { + goals('clean') + rootPOM('sonar/pom.xml') + localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) + mavenInstallation('maven-3.2.1') + } + /* Currently not done, let's see if it is still necessary: + # Maven-Download fails for strange reasons, try to workaround... + mkdir -p sonar/ooxml-schema-security/target/schemas && wget -O sonar/ooxml-schema-security/target/schemas/xmldsig-core-schema.xsd http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd + */ + maven { + goals('package') + rootPOM('sonar/pom.xml') + mavenOpts('-Xmx2g') + mavenOpts('-Xms256m') + mavenOpts('-XX:MaxPermSize=512m') + mavenOpts('-XX:-OmitStackTraceInFastThrow') + localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) + mavenInstallation('maven-3.2.1') + } + } + publishers { + configure { project -> + project / publishers << 'hudson.plugins.cigame.GamePublisher' {} + } + mailer(email, false, false) + } + } else if (poijob.javadoc) { + steps { + shell(shellcmds) + ant { + targets(['clean', 'javadocs'] + (poijob.properties ?: [])) + prop('coverage.enabled', true) + // Properties did not work, so I had to use targets instead + //properties(poijob.properties ?: '') + antInstallation(defaultAnt) + } + shell('zip -r build/javadocs.zip build/tmp/site/build/site/apidocs') } - } - jdk(jdkMapping.get(jdkKey)) - scm { - svn(svnBase) { svnNode -> - svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') / - url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN' - } - } - triggers { - scm(trigger) - } - steps { - shell('# show which files are currently modified in the working copy\n' + - 'svn status\n' + - '\n' + - 'echo $JAVA_HOME\n' + - 'ls -al $JAVA_HOME\n' + - '\n' + - (poijob.shell ?: '') + '\n' + - '# ignore any error message\n' + - 'exit 0\n') - ant { - targets(['clean', 'jenkins']) - prop('coverage.enabled', true) - //properties(poijob.properties ?: '') - antInstallation('Ant (latest)') - } - ant { - buildFile('src/integrationtest/build.xml') - //properties(poijob.properties ?: '') - antInstallation('Ant (latest)') - } - } - publishers { - findbugs('build/findbugs.xml', false) { - healthLimits(3, 20) - thresholdLimit('low') - defaultEncoding('UTF-8') - } - archiveArtifacts('build/dist/*.tar.gz,build/findbugs.html,build/coverage/**,build/integration-test-results/**,ooxml-lib/**') - warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) { - resolveRelativePaths() - } - archiveJunit('build/ooxml-test-results/*.xml,build/scratchpad-test-results/*.xml,build/test-results/*.xml,build/excelant-test-results/*.xml,build/integration-test-results/*.xml') { - testDataPublishers { - publishTestStabilityData() + publishers { + configure { project -> + project / publishers << 'hudson.plugins.cigame.GamePublisher' {} + } + mailer(email, false, false) + } + } else if (poijob.apicheck) { + steps { + shell(shellcmds) + gradle { + tasks('japicmp') + useWrapper(false) } } - jacocoCodeCoverage { - classPattern('build/classes,build/examples-classes,build/excelant-classes,build/ooxml-classes,build/scratchpad-classes') - execPattern('build/*.exec') - sourcePattern('src/java,src/excelant/java,src/ooxml/java,src/scratchpad/src') - exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class') - } - configure { project -> - project / publishers << 'hudson.plugins.cigame.GamePublisher' {} - } - mailer('dev@poi.apache.org', false, false) - } - } - } + publishers { + archiveArtifacts('build/*/build/reports/japi.html') + configure { project -> + project / publishers << 'hudson.plugins.cigame.GamePublisher' {} + } + mailer(email, false, false) + } + } else { + steps { + shell(shellcmds) + // For Jobs that should still have the default set of publishers we can configure different steps here + if(poijob.gradle) { + gradle { + tasks('check') + useWrapper(false) + } + } else if (poijob.noScratchpad) { + ant { + targets(['clean', 'compile-all'] + (poijob.properties ?: [])) + prop('coverage.enabled', true) + antInstallation(defaultAnt) + } + ant { + targets(['-Dscratchpad.ignore=true', 'jacocotask', 'test-main', 'test-ooxml', 'test-excelant', 'test-ooxml-lite', 'testcoveragereport'] + (poijob.properties ?: [])) + antInstallation(defaultAnt) + } + } else { + ant { + targets(['clean', 'jenkins'] + (poijob.properties ?: [])) + prop('coverage.enabled', true) + // Properties did not work, so I had to use targets instead + //properties(poijob.properties ?: '') + antInstallation(defaultAnt) + } + ant { + targets(['run'] + (poijob.properties ?: [])) + buildFile('src/integrationtest/build.xml') + // Properties did not work, so I had to use targets instead + //properties(poijob.properties ?: '') + antInstallation(defaultAnt) + } + } + } + publishers { + findbugs('build/findbugs.xml', false) { + healthLimits(3, 20) + thresholdLimit('low') + defaultEncoding('UTF-8') + } + archiveArtifacts('build/dist/*.tar.gz,build/findbugs.html,build/coverage/**,build/integration-test-results/**,ooxml-lib/**,build/*/build/libs/*.jar') + warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) { + resolveRelativePaths() + } + archiveJunit('build/ooxml-test-results/*.xml,build/scratchpad-test-results/*.xml,build/test-results/*.xml,build/excelant-test-results/*.xml,build/integration-test-results/*.xml,build/*/build/test-results/TEST-*.xml') { + testDataPublishers { + publishTestStabilityData() + } + } + jacocoCodeCoverage { + classPattern('build/classes,build/examples-classes,build/excelant-classes,build/ooxml-classes,build/scratchpad-classes') + execPattern('build/*.exec') + sourcePattern('src/java,src/excelant/java,src/ooxml/java,src/scratchpad/src') + exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class') + } + configure { project -> + project / publishers << 'hudson.plugins.cigame.GamePublisher' {} + } + mailer(email, false, false) + } + } + } + } }