Skip to content

Commit cfb7079

Browse files
committed
Tweak CI build to run compatibility builds against JDK 17.
Issue #2068.
1 parent c6b77e3 commit cfb7079

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Diff for: Jenkinsfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ pipeline {
4747
}
4848
}
4949
}
50-
stage('Publish JDK 16 + MongoDB 4.4') {
50+
stage('Publish JDK 17/ + MongoDB 4.4') {
5151
when {
52-
changeset "ci/openjdk16-mongodb-4.4/**"
52+
changeset "ci/openjdk17-mongodb-4.4/**"
5353
}
5454
agent { label 'data' }
5555
options { timeout(time: 30, unit: 'MINUTES') }
5656

5757
steps {
5858
script {
59-
def image = docker.build("springci/spring-data-rest-openjdk16-with-mongodb-4.4", "ci/openjdk16-mongodb-4.4/")
59+
def image = docker.build("springci/spring-data-rest-openjdk17-with-mongodb-4.4", "ci/openjdk17-mongodb-4.4/")
6060
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6161
image.push()
6262
}
@@ -127,7 +127,7 @@ pipeline {
127127
}
128128
}
129129
}
130-
stage("test: baseline (jdk16)") {
130+
stage("test: baseline (JDK 17)") {
131131
agent {
132132
label 'data'
133133
}
@@ -138,7 +138,7 @@ pipeline {
138138
steps {
139139
script {
140140
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
141-
docker.image('springci/spring-data-rest-openjdk16-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
141+
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
142142
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
143143
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
144144
sh 'sleep 10'
@@ -173,7 +173,7 @@ pipeline {
173173
}
174174
}
175175
}
176-
stage("test: spring53-next (jdk16)") {
176+
stage("test: spring53-next (JDK 17)") {
177177
agent {
178178
label 'data'
179179
}
@@ -184,7 +184,7 @@ pipeline {
184184
steps {
185185
script {
186186
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
187-
docker.image('springci/spring-data-rest-openjdk16-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
187+
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
188188
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
189189
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
190190
sh 'sleep 10'

Diff for: ci/openjdk16-mongodb-4.4/Dockerfile renamed to ci/openjdk17-mongodb-4.4/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
FROM adoptopenjdk/openjdk16:latest
1+
FROM openjdk:17-bullseye
22

33
ENV TZ=Etc/UTC
44
ENV DEBIAN_FRONTEND=noninteractive
55

6+
RUN sed -i -e 's/http/https/g' /etc/apt/sources.list
7+
68
RUN set -eux; \
79
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
810
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \

0 commit comments

Comments
 (0)