From 418125dc606eb4aa471bb8dc0e5fc4ac2eba5bf0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Nov 2024 11:01:38 +0100 Subject: [PATCH] Upgrade MongoDB 8 build to Java.next. Closes #4828 --- Jenkinsfile | 29 ++++--------------- ci/openjdk21-mongodb-7.0/Dockerfile | 25 ---------------- .../Dockerfile | 2 +- 3 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 ci/openjdk21-mongodb-7.0/Dockerfile rename ci/{openjdk17-mongodb-8.0 => openjdk21-mongodb-8.0}/Dockerfile (94%) diff --git a/Jenkinsfile b/Jenkinsfile index 10d4f2fca..9d348d1a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,26 +96,7 @@ pipeline { } } } - stage('Publish JDK (Java.next) + MongoDB 7.0') { - when { - anyOf { - changeset "ci/openjdk21-mongodb-7.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-7.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.7.0.version']} ci/openjdk21-mongodb-7.0/") - docker.withRegistry(p['docker.registry'], p['docker.credentials']) { - image.push() - } - } - } - } - stage('Publish JDK (Java 17) + MongoDB 8.0') { + stage('Publish JDK (Java.next) + MongoDB 8.0') { when { anyOf { changeset "ci/openjdk17-mongodb-8.0/**" @@ -127,7 +108,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.8.0.version']} ci/openjdk17-mongodb-8.0/") + def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.8.0.version']} ci/openjdk17-mongodb-8.0/") docker.withRegistry(p['docker.registry'], p['docker.credentials']) { image.push() } @@ -241,7 +222,7 @@ pipeline { } } - stage("test: MongoDB 7.0 (next)") { + stage("test: MongoDB 7.0 (main)") { agent { label 'data' } @@ -253,7 +234,7 @@ pipeline { steps { script { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image("springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) { + docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) { sh 'ci/start-replica.sh' sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + "./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B" @@ -275,7 +256,7 @@ pipeline { steps { script { docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) { + docker.image("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) { sh 'ci/start-replica.sh' sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + "./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B" diff --git a/ci/openjdk21-mongodb-7.0/Dockerfile b/ci/openjdk21-mongodb-7.0/Dockerfile deleted file mode 100644 index 0b803215b..000000000 --- a/ci/openjdk21-mongodb-7.0/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -ARG BASE -FROM ${BASE} -# Any ARG statements before FROM are cleared. -ARG MONGODB - -ENV TZ=Etc/UTC -ENV DEBIAN_FRONTEND=noninteractive -ENV MONGO_VERSION=${MONGODB} - -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 7.0 release signing key - wget -qO - https://www.mongodb.org/static/pgp/server-7.0.asc | apt-key add - && \ - # Needed when MongoDB creates a 7.0 folder. - echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.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/* diff --git a/ci/openjdk17-mongodb-8.0/Dockerfile b/ci/openjdk21-mongodb-8.0/Dockerfile similarity index 94% rename from ci/openjdk17-mongodb-8.0/Dockerfile rename to ci/openjdk21-mongodb-8.0/Dockerfile index 281824610..0cb80001b 100644 --- a/ci/openjdk17-mongodb-8.0/Dockerfile +++ b/ci/openjdk21-mongodb-8.0/Dockerfile @@ -16,7 +16,7 @@ RUN set -eux; \ # MongoDB 8.0 release signing key wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | apt-key add - && \ # Needed when MongoDB creates a 8.0 folder. - echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list && \ + echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list && \ echo ${TZ} > /etc/timezone RUN apt-get update && \