Author: centic
Date: Sat Aug 12 14:53:51 2023
New Revision: 1911613
URL: http://svn.apache.org/viewvc?rev=1911613&view=rev
Log:
Jenkins DSL: Add JDK 20, 21 and 22, disable JDK 18 and 19, remove JDK 10, 12,
13, 14
Modified:
poi/trunk/jenkins/create_jobs.groovy
Modified: poi/trunk/jenkins/create_jobs.groovy
URL:
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1911613&r1=1911612&r2=1911613&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Sat Aug 12 14:53:51 2023
@@ -25,11 +25,11 @@ def poijobs = [
[ name: 'POI-DSL-1.11', jdk: '1.11', trigger: triggerSundays,
skipcigame: true
],
[ name: 'POI-DSL-1.15', jdk: '1.15', trigger: triggerSundays,
skipcigame: true,
- // let's save some CPU cycles here, 15 is not a LTS and JDK 16 is GA
+ // let's save some CPU cycles here, 15 is not an LTS and JDK 16 is GA
disabled: true
],
- [ name: 'POI-DSL-1.16', jdk: '1.16', trigger: 'H */12 * * *',
skipcigame: true,
- // let's save some CPU cycles here, 16 is not a LTS and JDK 17 is GA
+ [ name: 'POI-DSL-1.16', jdk: '1.16', trigger: triggerSundays,
skipcigame: true,
+ // let's save some CPU cycles here, 16 is not an LTS and JDK 17 is GA
disabled: true
],
[ name: 'POI-DSL-1.17', jdk: '1.17', trigger: 'H */12 * * *',
skipcigame: true
@@ -45,6 +45,12 @@ def poijobs = [
// Jenkins on ci-builds.apache.org does not support spotbugs with a
new enough version of asm for Java18+
[ name: 'POI-DSL-1.20', jdk: '1.20', trigger: triggerSundays,
skipcigame: true, skipSpotbugs: true
],
+ // Jenkins on ci-builds.apache.org does not support spotbugs with a
new enough version of asm for Java18+
+ [ name: 'POI-DSL-1.21', jdk: '1.21', trigger: 'H */12 * * *',
skipcigame: true, skipSpotbugs: true
+ ],
+ // Jenkins on ci-builds.apache.org does not support spotbugs with a
new enough version of asm for Java18+
+ [ name: 'POI-DSL-1.22', jdk: '1.22', trigger: triggerSundays,
skipcigame: true, skipSpotbugs: true
+ ],
// Use Ant-build for now as selecting IBM JDK via toolchain does not
work (yet)
[ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays,
skipcigame: true, useAnt: true
],
@@ -82,20 +88,26 @@ def poijobs = [
jenkinsLite: true
],
[ name: 'POI-DSL-Windows-1.15', jdk: '1.15', trigger: triggerSundays,
windows: true, slaves: 'Windows', skipcigame: true,
- // let's save some CPU cycles here, 14 is not a LTS and JDK 15 is GA
as of 15 September 2020
+ // let's save some CPU cycles here, 14 is not an LTS and JDK 15 is
GA as of 15 September 2020
disabled: true
],
- [ name: 'POI-DSL-Windows-1.16', jdk: '1.16', trigger: 'H */12 * * *',
windows: true, slaves: 'Windows', skipcigame: true,
- // let's save some CPU cycles here, 16 is not a LTS and JDK 17 is GA
+ [ name: 'POI-DSL-Windows-1.16', jdk: '1.16', trigger: triggerSundays,
windows: true, slaves: 'Windows', skipcigame: true,
+ // let's save some CPU cycles here, 16 is not an LTS and JDK 17 is GA
disabled: true
],
[ name: 'POI-DSL-Windows-1.17', jdk: '1.17', trigger: 'H */12 * * *',
windows: true, slaves: 'Windows', skipcigame: true
],
[ name: 'POI-DSL-Windows-1.18', jdk: '1.18', trigger: triggerSundays,
windows: true, slaves: 'Windows', skipcigame: true,
skipSpotbugs: true,
- // let's save some CPU cycles here, 18 is not a LTS and JDK 20 is out
+ // let's save some CPU cycles here, 18 is not an LTS and JDK 20 is
out
disabled: true
],
+ [ name: 'POI-DSL-Windows-1.20', jdk: '1.20', trigger: triggerSundays,
windows: true, slaves: 'Windows', skipcigame: true
+ ],
+ [ name: 'POI-DSL-Windows-1.21', jdk: '1.21', trigger: 'H */12 * * *',
windows: true, slaves: 'Windows', skipcigame: true
+ ],
+ [ name: 'POI-DSL-Windows-1.22', jdk: '1.22', trigger: triggerSundays,
windows: true, slaves: 'Windows', skipcigame: true
+ ],
[ name: 'POI-DSL-Github-PullRequests', trigger: '', skipcigame: true,
disabled: true
],
]
@@ -106,16 +118,24 @@ def xmlbeansjobs = [
[ name: 'POI-XMLBeans-DSL-1.11', jdk: '1.11', trigger: triggerSundays,
skipcigame: true,
],
[ name: 'POI-XMLBeans-DSL-1.16', jdk: '1.16', trigger: triggerSundays,
skipcigame: true,
- // let's save some CPU cycles here, 16 is not a LTS and JDK 17 is GA
+ // let's save some CPU cycles here, 16 is not an LTS and JDK 17 is GA
disabled: true
],
- [ name: 'POI-XMLBeans-DSL-1.17', jdk: '1.17', trigger: triggerSundays,
skipcigame: true,
+ [ name: 'POI-XMLBeans-DSL-1.17', jdk: '1.17', trigger: 'H */12 * * *',
skipcigame: true,
],
[ name: 'POI-XMLBeans-DSL-1.18', jdk: '1.18', trigger: triggerSundays,
skipcigame: true,
- // let's save some CPU cycles here, 18 is not a LTS and JDK 20 is out
+ // let's save some CPU cycles here, 18 is not an LTS and JDK 20 is
out
disabled: true
],
[ name: 'POI-XMLBeans-DSL-1.19', jdk: '1.19', trigger: triggerSundays,
skipcigame: true,
+ // let's save some CPU cycles here, 19 is not an LTS
+ disabled: true
+ ],
+ [ name: 'POI-XMLBeans-DSL-1.20', jdk: '1.20', trigger: triggerSundays,
skipcigame: true,
+ ],
+ [ name: 'POI-XMLBeans-DSL-1.21', jdk: '1.21', trigger: 'H */12 * * *',
skipcigame: true,
+ ],
+ [ name: 'POI-XMLBeans-DSL-1.22', jdk: '1.22', trigger: triggerSundays,
skipcigame: true,
],
[ name: 'POI-XMLBeans-DSL-1.20', jdk: '1.20', trigger: triggerSundays,
skipcigame: true,
],
@@ -138,11 +158,7 @@ def defaultSlaves = '(ubuntu)&&!beam&&!c
def jdkMapping = [
'1.8': [ jenkinsJdk: 'jdk_1.8_latest', jdkVersion: 8, jdkVendor: '' ],
- '1.10': [ jenkinsJdk: 'jdk_10_latest', jdkVersion: 10, jdkVendor: '' ],
'1.11': [ jenkinsJdk: 'jdk_11_latest', jdkVersion: 11, jdkVendor: '' ],
- '1.12': [ jenkinsJdk: 'jdk_12_latest', jdkVersion: 12, jdkVendor: '' ],
- '1.13': [ jenkinsJdk: 'jdk_13_latest', jdkVersion: 13, jdkVendor: '' ],
- '1.14': [ jenkinsJdk: 'jdk_14_latest', jdkVersion: 14, jdkVendor: '' ],
'1.15': [ jenkinsJdk: 'jdk_15_latest', jdkVersion: 15, jdkVendor: '' ],
'1.16': [ jenkinsJdk: 'jdk_16_latest', jdkVersion: 16, jdkVendor: '' ],
'1.17': [ jenkinsJdk: 'jdk_17_latest', jdkVersion: 17, jdkVendor: '' ],
@@ -150,6 +166,7 @@ def jdkMapping = [
'1.19': [ jenkinsJdk: 'jdk_19_latest', jdkVersion: 19, jdkVendor: '' ],
'1.20': [ jenkinsJdk: 'jdk_20_latest', jdkVersion: 20, jdkVendor: '' ],
'1.21': [ jenkinsJdk: 'jdk_21_latest', jdkVersion: 21, jdkVendor: '' ],
+ '1.22': [ jenkinsJdk: 'jdk_22_latest', jdkVersion: 22, jdkVendor: '' ],
'OpenJDK 1.8': [ jenkinsJdk: 'adoptopenjdk_hotspot_8u282', jdkVersion:
8, jdkVendor: 'adoptopenjdk' ],
'IBMJDK': [ jenkinsJdk: 'ibmjdk_1.8.0_261', jdkVersion: 8, jdkVendor:
'ibm' ]
]
@@ -272,11 +289,6 @@ poijobs.each { poijob ->
environmentVariables {
env('LANG', 'en_US.UTF-8')
env('CI_BUILD', 'TRUE')
- if(jdkKey == '1.10') {
- // when using JDK 9/10 for running Ant, we need to provide
more modules for the forbidden-api-checks task
- // on JDK 11 and newer there is no such module any more, so do
not add it here
- env('ANT_OPTS', '--add-modules=java.xml.bind
--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED')
- }
env('FORREST_HOME', poijob.windows ?
'f:\\jenkins\\tools\\forrest\\latest' : '/home/jenkins/tools/forrest/latest')
}
@@ -497,11 +509,7 @@ xmlbeansjobs.each { xjob ->
label(slaves)
environmentVariables {
env('LANG', 'en_US.UTF-8')
- if(jdkKey == '1.10') {
- // when using JDK 9/10 for running Ant, we need to provide
more modules for the forbidden-api-checks task
- // on JDK 11 and newer there is no such module any more, so do
not add it here
- env('ANT_OPTS', '--add-modules=java.xml.bind
--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED')
- } else if (jdkKey == '1.11' || jdkKey == '1.12' || jdkKey ==
'1.13' || jdkKey == '1.14' || jdkKey == '1.15' || jdkKey == '1.16' || jdkKey ==
'1.17'
+ if (jdkKey == '1.11' || jdkKey == '1.15' || jdkKey == '1.16' ||
jdkKey == '1.17'
|| jdkKey == '1.18' || jdkKey == '1.19' || jdkKey ==
'1.20' || jdkKey == '1.21') {
env('ANT_OPTS',
'--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED')
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
