Skip to content

Commit

Permalink
Tweak CI build to run compatibility builds against JDK 17.
Browse files Browse the repository at this point in the history
Issue #2068.
  • Loading branch information
odrotbohm committed Sep 21, 2021
1 parent c6b77e3 commit cfb7079
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
14 changes: 7 additions & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ pipeline {
}
}
}
stage('Publish JDK 16 + MongoDB 4.4') {
stage('Publish JDK 17/ + MongoDB 4.4') {
when {
changeset "ci/openjdk16-mongodb-4.4/**"
changeset "ci/openjdk17-mongodb-4.4/**"
}
agent { label 'data' }
options { timeout(time: 30, unit: 'MINUTES') }

steps {
script {
def image = docker.build("springci/spring-data-rest-openjdk16-with-mongodb-4.4", "ci/openjdk16-mongodb-4.4/")
def image = docker.build("springci/spring-data-rest-openjdk17-with-mongodb-4.4", "ci/openjdk17-mongodb-4.4/")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
Expand Down Expand Up @@ -127,7 +127,7 @@ pipeline {
}
}
}
stage("test: baseline (jdk16)") {
stage("test: baseline (JDK 17)") {
agent {
label 'data'
}
Expand All @@ -138,7 +138,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image('springci/spring-data-rest-openjdk16-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
sh 'sleep 10'
Expand Down Expand Up @@ -173,7 +173,7 @@ pipeline {
}
}
}
stage("test: spring53-next (jdk16)") {
stage("test: spring53-next (JDK 17)") {
agent {
label 'data'
}
Expand All @@ -184,7 +184,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image('springci/spring-data-rest-openjdk16-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
sh 'sleep 10'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM adoptopenjdk/openjdk16:latest
FROM openjdk:17-bullseye

ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive

RUN sed -i -e 's/http/https/g' /etc/apt/sources.list

RUN set -eux; \
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
Expand Down

0 comments on commit cfb7079

Please sign in to comment.