DATALDAP-176 - Use JDK 15 for next CI jobs.

gregturn · gregturn · commit 0568b0d24712 · 2020-10-26T13:23:42.000-05:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
 
 		stage("Test other configurations") {
 			when {
-				anyOf {
+				allOf {
 					branch 'master'
 					not { triggeredBy 'UpstreamCause' }
 				}
@@ -56,10 +56,10 @@ pipeline {
 					}
 				}
 
-				stage("test: baseline (jdk14)") {
+				stage("test: baseline (jdk15)") {
 					agent {
 						docker {
-							image 'adoptopenjdk/openjdk14:latest'
+							image 'adoptopenjdk/openjdk15:latest'
 							label 'data'
 							args '-v $HOME:/tmp/jenkins-home'
 						}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ pipeline {`
`35`	`35`
`36`	`36`	`stage("Test other configurations") {`
`37`	`37`	`when {`
`38`		`- anyOf {`
	`38`	`+ allOf {`
`39`	`39`	`branch 'master'`
`40`	`40`	`not { triggeredBy 'UpstreamCause' }`
`41`	`41`	`}`
`@@ -56,10 +56,10 @@ pipeline {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- stage("test: baseline (jdk14)") {`
	`59`	`+ stage("test: baseline (jdk15)") {`
`60`	`60`	`agent {`
`61`	`61`	`docker {`
`62`		`- image 'adoptopenjdk/openjdk14:latest'`
	`62`	`+ image 'adoptopenjdk/openjdk15:latest'`
`63`	`63`	`label 'data'`
`64`	`64`	`args '-v $HOME:/tmp/jenkins-home'`
`65`	`65`	`}`