Jenkins DSL: Use single-quotes, add back space in OpenJDK JDK name, exclude one more slave that causes strange errors in the JDK 1.8-run
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1773204 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3cdf699add
commit
aeb22bab67
@ -13,9 +13,11 @@ H H * * 0
|
|||||||
def poijobs = [
|
def poijobs = [
|
||||||
[ name: 'POI-DSL-1.6', jdks: ['1.6']
|
[ 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 * * *',
|
||||||
|
// ubuntu-4 repeatedely failed during Findbugs results collection
|
||||||
|
slaveAdd: '&&!ubuntu-4'
|
||||||
],
|
],
|
||||||
[ name: 'POI-DSL-OpenJDK', jdks: ["OpenJDK"], trigger: 'H */12 * * *',
|
[ name: 'POI-DSL-OpenJDK', jdks: ['OpenJDK'], trigger: 'H */12 * * *',
|
||||||
// H16 does not have OpenJDK 6 installed
|
// H16 does not have OpenJDK 6 installed
|
||||||
slaveAdd: '&&!H16&&!ubuntu-eu2',
|
slaveAdd: '&&!H16&&!ubuntu-eu2',
|
||||||
// the JDK is missing on some slaves so builds are unstable
|
// the JDK is missing on some slaves so builds are unstable
|
||||||
@ -45,19 +47,20 @@ def poijobs = [
|
|||||||
],
|
],
|
||||||
]
|
]
|
||||||
|
|
||||||
def svnBase = "https://svn.apache.org/repos/asf/poi/trunk"
|
def svnBase = 'https://svn.apache.org/repos/asf/poi/trunk'
|
||||||
def defaultJdks = ['1.6']
|
def defaultJdks = ['1.6']
|
||||||
def defaultTrigger = 'H/15 * * * *'
|
def defaultTrigger = 'H/15 * * * *'
|
||||||
def defaultEmail = 'dev@poi.apache.org'
|
def defaultEmail = 'dev@poi.apache.org'
|
||||||
def defaultAnt = 'Ant (latest)'
|
def defaultAnt = 'Ant (latest)'
|
||||||
|
def defaultSlaves = 'ubuntu&&!cloud-slave'
|
||||||
|
|
||||||
def jdkMapping = [
|
def jdkMapping = [
|
||||||
'1.6': "JDK 1.6 (latest)",
|
'1.6': 'JDK 1.6 (latest)',
|
||||||
'1.7': "JDK 1.7 (latest)",
|
'1.7': 'JDK 1.7 (latest)',
|
||||||
'1.8': "JDK 1.8 (latest)",
|
'1.8': 'JDK 1.8 (latest)',
|
||||||
'1.9': "JDK 9 b142 (early access build) with project Jigsaw",
|
'1.9': 'JDK 9 b142 (early access build) with project Jigsaw',
|
||||||
"OpenJDK": "OpenJDK 6 (on Ubuntu only)",
|
'OpenJDK': 'OpenJDK 6 (on Ubuntu only) ', // blank is required here until the name in the Jenkins instance is fixed!
|
||||||
"IBMJDK": "IBM 1.8 64-bit (on Ubuntu only)",
|
'IBMJDK': 'IBM 1.8 64-bit (on Ubuntu only)',
|
||||||
]
|
]
|
||||||
|
|
||||||
poijobs.each { poijob ->
|
poijobs.each { poijob ->
|
||||||
@ -65,6 +68,7 @@ poijobs.each { poijob ->
|
|||||||
def jdks = poijob.jdks ?: defaultJdks
|
def jdks = poijob.jdks ?: defaultJdks
|
||||||
def trigger = poijob.trigger ?: defaultTrigger
|
def trigger = poijob.trigger ?: defaultTrigger
|
||||||
def email = poijob.email ?: defaultEmail
|
def email = poijob.email ?: defaultEmail
|
||||||
|
def slaves = defaultSlaves + (poijob.slaveAdd ?: '')
|
||||||
|
|
||||||
jdks.each { jdkKey ->
|
jdks.each { jdkKey ->
|
||||||
job(poijob.name) {
|
job(poijob.name) {
|
||||||
@ -108,7 +112,7 @@ Apache POI - the Java API for Microsoft Documents
|
|||||||
numToKeep(5)
|
numToKeep(5)
|
||||||
artifactNumToKeep(1)
|
artifactNumToKeep(1)
|
||||||
}
|
}
|
||||||
label('ubuntu&&!cloud-slave' + (poijob.slaveAdd ?: ''))
|
label(slaves)
|
||||||
environmentVariables {
|
environmentVariables {
|
||||||
env('LANG', 'en_US.UTF-8')
|
env('LANG', 'en_US.UTF-8')
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user