Jenkins DLS: Remove support for multiple JDKs, it was not used and did not work anyway due to name-clashes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776649 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-12-30 22:12:14 +00:00
parent a30315de20
commit e66d78a388
1 changed files with 193 additions and 195 deletions

View File

@ -16,17 +16,17 @@ def poijobs = [
// as part of the Ant build
addShell: 'wget -O lib/findbugs-noUpdateChecks-2.0.3.zip http://downloads.sourceforge.net/project/findbugs/findbugs/2.0.3/findbugs-noUpdateChecks-2.0.3.zip?download='
],
[ name: 'POI-DSL-1.8', jdks: ['1.8'], trigger: 'H */12 * * *',
[ name: 'POI-DSL-1.8', jdk: '1.8', trigger: 'H */12 * * *',
// ubuntu-4 repeatedely failed during Findbugs results collection
slaveAdd: '&&!ubuntu-4'
],
[ name: 'POI-DSL-OpenJDK', jdks: ['OpenJDK'], trigger: 'H */12 * * *',
[ name: 'POI-DSL-OpenJDK', jdk: 'OpenJDK', trigger: 'H */12 * * *',
// H13-H20 (Ubuntu 16.04) do not have OpenJDK 6 installed, see https://issues.apache.org/jira/browse/INFRA-12880
slaveAdd: '&&!H13&&!H14&&!H15&&!H16&&!H17&&!H18&&!H19&&!H20&&!ubuntu-eu2',
// the JDK is missing on some slaves so builds are unstable
skipcigame: true
],
[ name: 'POI-DSL-1.9', jdks: ['1.9'], trigger: triggerSundays,
[ name: 'POI-DSL-1.9', jdk: '1.9', trigger: triggerSundays,
properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true',
'-Djava9addmods=--add-modules=java.xml.bind',
'-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
@ -37,7 +37,7 @@ def poijobs = [
'-Djava.locale.providers=JRE,CLDR'],
skipcigame: true
],
[ name: 'POI-DSL-IBM-JDK', jdks: ['IBMJDK'], trigger: triggerSundays, noScratchpad: true,
[ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays, noScratchpad: true,
// some OOXML tests fail with strange XML parsing errors and missing JCE unlimited strength requirements
disabled: true, skipcigame: true
],
@ -53,20 +53,20 @@ def poijobs = [
],
[ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true
],
[ name: 'POI-DSL-API-Check', jdks: ['1.7'], trigger: '@daily', apicheck: true
[ name: 'POI-DSL-API-Check', jdk: '1.7', trigger: '@daily', apicheck: true
],
[ name: 'POI-DSL-Gradle', jdks: ['1.7'], trigger: triggerSundays, email: 'centic@apache.org', gradle: true,
[ name: 'POI-DSL-Gradle', jdk: '1.7', trigger: triggerSundays, email: 'centic@apache.org', gradle: true,
// Gradle will not run any tests if the code is up-to-date, therefore manually mark the files as updated
addShell: 'touch --no-create build/*/build/test-results/test/TEST-*.xml'
],
[ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true
],
[ name: 'POI-DSL-SonarQube', jdks: ['1.8'], trigger: 'H 9 * * *', maven: true, sonar: true
[ name: 'POI-DSL-SonarQube', jdk: '1.8', trigger: 'H 9 * * *', maven: true, sonar: true
],
]
def svnBase = 'https://svn.apache.org/repos/asf/poi/trunk'
def defaultJdks = ['1.6']
def defaultJdk = '1.6'
def defaultTrigger = 'H/15 * * * *'
def defaultEmail = 'dev@poi.apache.org'
def defaultAnt = 'Ant (latest)'
@ -83,12 +83,11 @@ def jdkMapping = [
poijobs.each { poijob ->
def jdks = poijob.jdks ?: defaultJdks
def jdkKey = poijob.jdk ?: defaultJdk
def trigger = poijob.trigger ?: defaultTrigger
def email = poijob.email ?: defaultEmail
def slaves = defaultSlaves + (poijob.slaveAdd ?: '')
jdks.each { jdkKey ->
job(poijob.name) {
if (poijob.disabled) {
disabled()
@ -316,4 +315,3 @@ Apache POI - the Java API for Microsoft Documents
}
}
}
}