From b67a580786056923cbf29a430105f1f7f640ce80 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sat, 26 Oct 2019 05:37:32 +0000 Subject: [PATCH] Jenkins-DSL: Add JDK 14, remove JDK 10, add testing for Maven to Test-Environment git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1868985 13f79535-47bb-0310-9956-ffa450edef68 --- jenkins/create_jobs.groovy | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index 50be555ac0..bfd400c666 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -89,6 +89,7 @@ def defaultTrigger = 'H/15 * * * *' // check SCM every 60/15 = 4 minutes def defaultEmail = 'dev@poi.apache.org' def defaultAnt = 'Ant 1.9 (Latest)' def defaultAntWindows = 'Ant 1.9 (Latest Windows)' +def defaultMaven = 'maven-3.2.1' // currently a lot of H?? slaves don't have Ant installed ... H21 seems to have a SVN problem // H35 fails with ImageIO create cache file errors, although the java.io.tmpdir is writable def defaultSlaves = '(ubuntu)&&!beam&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H21&&!H35' @@ -290,7 +291,7 @@ poijobs.each { poijob -> goals('clean') rootPOM('sonar/pom.xml') localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) - mavenInstallation('maven-3.2.1') + mavenInstallation(defaultMaven) } /* Currently not done, let's see if it is still necessary: # Maven-Download fails for strange reasons, try to workaround... @@ -307,7 +308,7 @@ poijobs.each { poijob -> mavenOpts('-Xms256m') mavenOpts('-XX:-OmitStackTraceInFastThrow') localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) - mavenInstallation('maven-3.2.1') + mavenInstallation(defaultMaven) } } publishers { @@ -570,13 +571,13 @@ Unfortunately we often see builds break because of changes/new machines...''') 'OpenJDK 8 (on Ubuntu only) ', // blank is required here until the name in the Jenkins instance is fixed! 'IBM 1.8 64-bit (on Ubuntu only)', - 'JDK 10 (latest)', - 'JDK 11 (latest)', 'JDK 12 (latest)', - 'JDK 13 (latest)' + 'JDK 13 (latest)', + + 'JDK 14 (latest)' ) elasticAxis { name('Nodes') @@ -600,6 +601,15 @@ echo '4.0.0org.apache.poibuild-tst1.0.0 > pom.xml +''') + maven { + goals('package') + mavenInstallation(defaultMaven) + } } } } -- 2.39.5