From bf921cdbd7909edfdfcbf1234dc2808560bd59ea Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Thu, 9 Apr 2020 14:29:16 -0500 Subject: [PATCH] DATAMONGO-2510 - Use JDK 14 for Java.NEXT CI testing. --- Jenkinsfile | 10 +++++----- .../Dockerfile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename ci/{openjdk13-mongodb-4.2 => openjdk14-mongodb-4.2}/Dockerfile (94%) diff --git a/Jenkinsfile b/Jenkinsfile index ca8038866..62ea20324 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,16 +46,16 @@ pipeline { } } } - stage('Publish JDK 13 + MongoDB 4.2') { + stage('Publish JDK 14 + MongoDB 4.2') { when { - changeset "ci/openjdk13-mongodb-4.2/**" + changeset "ci/openjdk14-mongodb-4.2/**" } agent { label 'data' } options { timeout(time: 30, unit: 'MINUTES') } steps { script { - def image = docker.build("springci/spring-data-openjdk13-with-mongodb-4.2.0", "ci/openjdk13-mongodb-4.2/") + def image = docker.build("springci/spring-data-openjdk14-with-mongodb-4.2.0", "ci/openjdk14-mongodb-4.2/") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } @@ -139,10 +139,10 @@ pipeline { } } - stage("test: baseline (jdk13)") { + stage("test: baseline (jdk14)") { agent { docker { - image 'springci/spring-data-openjdk13-with-mongodb-4.2.0:latest' + image 'springci/spring-data-openjdk14-with-mongodb-4.2.0:latest' label 'data' args '-v $HOME:/tmp/jenkins-home' } diff --git a/ci/openjdk13-mongodb-4.2/Dockerfile b/ci/openjdk14-mongodb-4.2/Dockerfile similarity index 94% rename from ci/openjdk13-mongodb-4.2/Dockerfile rename to ci/openjdk14-mongodb-4.2/Dockerfile index 7987bdb73..5f7d26c92 100644 --- a/ci/openjdk13-mongodb-4.2/Dockerfile +++ b/ci/openjdk14-mongodb-4.2/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk13:latest +FROM adoptopenjdk/openjdk14:latest ENV TZ=Etc/UTC ENV DEBIAN_FRONTEND=noninteractive