From 5733a00f54dd2eb853dfb5f8da076d8839ae584d Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Wed, 29 Mar 2023 15:23:01 -0500 Subject: [PATCH] Test against Java 20 on CI. See #4350. --- Jenkinsfile | 47 +++++++++++++++++++++++++++-- ci/openjdk20-mongodb-6.0/Dockerfile | 24 +++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 ci/openjdk20-mongodb-6.0/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index f7d27316a..d884fc987 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -77,10 +77,29 @@ pipeline { } } } + stage('Publish JDK (Java 20) + MongoDB 6.0') { + when { + anyOf { + changeset "ci/openjdk20-mongodb-6.0/**" + changeset "ci/pipeline.properties" + } + } + agent { label 'data' } + options { timeout(time: 30, unit: 'MINUTES') } + + steps { + script { + def image = docker.build("springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.6.0.version']} ci/openjdk20-mongodb-6.0/") + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + image.push() + } + } + } + } } } - stage("test: baseline (Java 17)") { + stage("test: baseline (main)") { when { beforeAgent(true) anyOf { @@ -119,7 +138,7 @@ pipeline { } parallel { - stage("test: MongoDB 5.0 (Java 17)") { + stage("test: MongoDB 5.0 (main)") { agent { label 'data' } @@ -141,7 +160,7 @@ pipeline { } } - stage("test: MongoDB 6.0 (Java 17)") { + stage("test: MongoDB 6.0 (main)") { agent { label 'data' } @@ -162,6 +181,28 @@ pipeline { } } } + + stage("test: MongoDB 6.0 (next)") { + agent { + label 'data' + } + options { timeout(time: 30, unit: 'MINUTES') } + environment { + ARTIFACTORY = credentials("${p['artifactory.credentials']}") + } + steps { + script { + docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) { + sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log' + sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &' + sh 'sleep 10' + sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"' + sh 'sleep 15' + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B' + } + } + } + } } } diff --git a/ci/openjdk20-mongodb-6.0/Dockerfile b/ci/openjdk20-mongodb-6.0/Dockerfile new file mode 100644 index 000000000..4e8dd5303 --- /dev/null +++ b/ci/openjdk20-mongodb-6.0/Dockerfile @@ -0,0 +1,24 @@ +ARG BASE +FROM ${BASE} +# Any ARG statements before FROM are cleared. +ARG MONGODB + +ENV TZ=Etc/UTC +ENV DEBIAN_FRONTEND=noninteractive + +RUN set -eux; \ + sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ + sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ + sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \ + sed -i -e 's/http/https/g' /etc/apt/sources.list && \ + apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \ + # MongoDB 6.0 release signing key + wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - && \ + # Needed when MongoDB creates a 6.0 folder. + echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list && \ + echo ${TZ} > /etc/timezone + +RUN apt-get update && \ + apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/*