Skip to content

Commit 418125d

Browse files
committed
Upgrade MongoDB 8 build to Java.next.
Closes #4828
1 parent c1c9fd0 commit 418125d

File tree

3 files changed

+6
-50
lines changed

3 files changed

+6
-50
lines changed

Jenkinsfile

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,26 +96,7 @@ pipeline {
9696
}
9797
}
9898
}
99-
stage('Publish JDK (Java.next) + MongoDB 7.0') {
100-
when {
101-
anyOf {
102-
changeset "ci/openjdk21-mongodb-7.0/**"
103-
changeset "ci/pipeline.properties"
104-
}
105-
}
106-
agent { label 'data' }
107-
options { timeout(time: 30, unit: 'MINUTES') }
108-
109-
steps {
110-
script {
111-
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/")
112-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
113-
image.push()
114-
}
115-
}
116-
}
117-
}
118-
stage('Publish JDK (Java 17) + MongoDB 8.0') {
99+
stage('Publish JDK (Java.next) + MongoDB 8.0') {
119100
when {
120101
anyOf {
121102
changeset "ci/openjdk17-mongodb-8.0/**"
@@ -127,7 +108,7 @@ pipeline {
127108

128109
steps {
129110
script {
130-
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/")
111+
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/")
131112
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
132113
image.push()
133114
}
@@ -241,7 +222,7 @@ pipeline {
241222
}
242223
}
243224

244-
stage("test: MongoDB 7.0 (next)") {
225+
stage("test: MongoDB 7.0 (main)") {
245226
agent {
246227
label 'data'
247228
}
@@ -253,7 +234,7 @@ pipeline {
253234
steps {
254235
script {
255236
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
256-
docker.image("springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
237+
docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
257238
sh 'ci/start-replica.sh'
258239
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
259240
"./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 {
275256
steps {
276257
script {
277258
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
278-
docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
259+
docker.image("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
279260
sh 'ci/start-replica.sh'
280261
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
281262
"./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"

ci/openjdk21-mongodb-7.0/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

ci/openjdk17-mongodb-8.0/Dockerfile renamed to ci/openjdk21-mongodb-8.0/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN set -eux; \
1616
# MongoDB 8.0 release signing key
1717
wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | apt-key add - && \
1818
# Needed when MongoDB creates a 8.0 folder.
19-
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 && \
19+
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 && \
2020
echo ${TZ} > /etc/timezone
2121

2222
RUN apt-get update && \

0 commit comments

Comments
 (0)