DATAMONGO-2629 - Use JDK 15 for next CI jobs.

This commit is contained in:
Greg L. Turnquist
2020-10-26 13:26:11 -05:00
parent bbbe369093
commit 2d348be5b2
2 changed files with 6 additions and 6 deletions

10
Jenkinsfile vendored
View File

@@ -46,16 +46,16 @@ pipeline {
} }
} }
} }
stage('Publish JDK 14 + MongoDB 4.2') { stage('Publish JDK 15 + MongoDB 4.2') {
when { when {
changeset "ci/openjdk14-mongodb-4.2/**" changeset "ci/openjdk15-mongodb-4.2/**"
} }
agent { label 'data' } agent { label 'data' }
options { timeout(time: 30, unit: 'MINUTES') } options { timeout(time: 30, unit: 'MINUTES') }
steps { steps {
script { script {
def image = docker.build("springci/spring-data-openjdk14-with-mongodb-4.2.0", "ci/openjdk14-mongodb-4.2/") def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.2.0", "ci/openjdk15-mongodb-4.2/")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push() image.push()
} }
@@ -139,10 +139,10 @@ pipeline {
} }
} }
stage("test: baseline (jdk14)") { stage("test: baseline (jdk15)") {
agent { agent {
docker { docker {
image 'springci/spring-data-openjdk14-with-mongodb-4.2.0:latest' image 'springci/spring-data-openjdk15-with-mongodb-4.2.0:latest'
label 'data' label 'data'
args '-v $HOME:/tmp/jenkins-home' args '-v $HOME:/tmp/jenkins-home'
} }

View File

@@ -1,4 +1,4 @@
FROM adoptopenjdk/openjdk14:latest FROM adoptopenjdk/openjdk15:latest
ENV TZ=Etc/UTC ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive