Skip to content

Commit 202b004

Browse files
christophstroblmp911de
authored andcommitted
Remove MongoDB 4.4 and 5.x test stages.
Stop testing against MongoDB server versions that are EOL already. MongoDB 4.4: EOL Feb. 2024 MongoDB 5.0: EOL Oct. 2024 Original pull request: #4893 Closes #4529
1 parent 8eedec2 commit 202b004

File tree

6 files changed

+8
-141
lines changed

6 files changed

+8
-141
lines changed

Jenkinsfile

+3-85
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,6 @@ pipeline {
2020
stages {
2121
stage("Docker images") {
2222
parallel {
23-
stage('Publish JDK (Java 17) + MongoDB 4.4') {
24-
when {
25-
anyOf {
26-
changeset "ci/openjdk17-mongodb-4.4/**"
27-
changeset "ci/pipeline.properties"
28-
}
29-
}
30-
agent { label 'data' }
31-
options { timeout(time: 30, unit: 'MINUTES') }
32-
33-
steps {
34-
script {
35-
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk17-mongodb-4.4/")
36-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
37-
image.push()
38-
}
39-
}
40-
}
41-
}
42-
stage('Publish JDK (Java 17) + MongoDB 5.0') {
43-
when {
44-
anyOf {
45-
changeset "ci/openjdk17-mongodb-5.0/**"
46-
changeset "ci/pipeline.properties"
47-
}
48-
}
49-
agent { label 'data' }
50-
options { timeout(time: 30, unit: 'MINUTES') }
51-
52-
steps {
53-
script {
54-
def image = docker.build("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.5.0.version']} ci/openjdk17-mongodb-5.0/")
55-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
56-
image.push()
57-
}
58-
}
59-
}
60-
}
6123
stage('Publish JDK (Java 17) + MongoDB 6.0') {
6224
when {
6325
anyOf {
@@ -137,8 +99,8 @@ pipeline {
13799
steps {
138100
script {
139101
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
140-
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
141-
sh 'ci/start-replica-4.x.sh'
102+
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
103+
sh 'ci/start-replica.sh'
142104
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
143105
"./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"
144106
}
@@ -156,50 +118,6 @@ pipeline {
156118
}
157119
}
158120
parallel {
159-
stage("test: MongoDB 5.0 (main)") {
160-
agent {
161-
label 'data'
162-
}
163-
options { timeout(time: 30, unit: 'MINUTES') }
164-
environment {
165-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
166-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
167-
}
168-
steps {
169-
script {
170-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
171-
docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
172-
sh 'ci/start-replica-4.x.sh'
173-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
174-
"./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"
175-
}
176-
}
177-
}
178-
}
179-
}
180-
181-
stage("test: MongoDB 6.0 (main)") {
182-
agent {
183-
label 'data'
184-
}
185-
options { timeout(time: 30, unit: 'MINUTES') }
186-
environment {
187-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
188-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
189-
}
190-
steps {
191-
script {
192-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
193-
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
194-
sh 'ci/start-replica.sh'
195-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
196-
"./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"
197-
}
198-
}
199-
}
200-
}
201-
}
202-
203121
stage("test: MongoDB 7.0 (driver-previous)") {
204122
agent {
205123
label 'data'
@@ -244,7 +162,7 @@ pipeline {
244162
}
245163
}
246164

247-
stage("test: MongoDB 8.0 (next)") {
165+
stage("test: MongoDB 8.0") {
248166
agent {
249167
label 'data'
250168
}

ci/openjdk17-mongodb-4.4/Dockerfile

-23
This file was deleted.

ci/openjdk17-mongodb-5.0/Dockerfile

-25
This file was deleted.

ci/pipeline.properties

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ docker.java.main.image=library/eclipse-temurin:${java.main.tag}
77
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
88

99
# Supported versions of MongoDB
10-
docker.mongodb.4.4.version=4.4.25
11-
docker.mongodb.5.0.version=5.0.21
1210
docker.mongodb.6.0.version=6.0.10
1311
docker.mongodb.7.0.version=7.0.2
1412
docker.mongodb.8.0.version=8.0.0

ci/start-replica-4.x.sh

-6
This file was deleted.

src/main/antora/modules/ROOT/pages/preface.adoc

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ See also the https://www.mongodb.com/docs/drivers/java/sync/current/compatibilit
2222
|Driver Version
2323
|Database Versions
2424
25+
|2025.0
26+
|4.5.x
27+
|5.3.x
28+
|6.x to 8.x
29+
2530
|2024.1
2631
|4.4.x
2732
|5.2.x

0 commit comments

Comments
 (0)