Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweak CI build to run compatibility builds against JDK 17.

Browse Source 
Issue #2068.
This commit is contained in:
Oliver Drotbohm
2021-09-21 16:48:43 +02:00
parent c6b77e3dd9
commit cfb7079fb8
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile vendored
View File

@@ -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()
}
@@ -127,7 +127,7 @@ pipeline {
}
}
}
stage("test: baseline (jdk16)") {
stage("test: baseline (JDK 17)") {
agent {
label 'data'
}
@@ -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'
@@ -173,7 +173,7 @@ pipeline {
}
}
}
stage("test: spring53-next (jdk16)") {
stage("test: spring53-next (JDK 17)") {
agent {
label 'data'
}
@@ -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'

4
ci/openjdk16-mongodb-4.4/Dockerfile → ci/openjdk17-mongodb-4.4/Dockerfile
View File

@@ -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 ; \