Skip to content

Commit 0432a6e

Browse files
committed
Remove MongoDB 6.0 docker build.
See #4956
1 parent 2656b3f commit 0432a6e

File tree

5 files changed

+6
-98
lines changed

5 files changed

+6
-98
lines changed

Jenkinsfile

+6-46
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,10 @@ pipeline {
2020
stages {
2121
stage("Docker images") {
2222
parallel {
23-
stage('Publish JDK (Java 17) + MongoDB 6.0') {
24-
when {
25-
anyOf {
26-
changeset "ci/openjdk17-mongodb-6.0/**"
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-6.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.6.0.version']} ci/openjdk17-mongodb-6.0/")
36-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
37-
image.push()
38-
}
39-
}
40-
}
41-
}
42-
stage('Publish JDK (Java 17) + MongoDB 7.0') {
23+
stage('Publish JDK (Java 24) + MongoDB 8.0') {
4324
when {
4425
anyOf {
45-
changeset "ci/openjdk17-mongodb-7.0/**"
26+
changeset "ci/openjdk24-mongodb-8.0/**"
4627
changeset "ci/pipeline.properties"
4728
}
4829
}
@@ -51,7 +32,7 @@ pipeline {
5132

5233
steps {
5334
script {
54-
def image = docker.build("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.7.0.version']} ci/openjdk17-mongodb-7.0/")
35+
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.7.0.version']} ci/openjdk24-mongodb-8.0/")
5536
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
5637
image.push()
5738
}
@@ -61,7 +42,7 @@ pipeline {
6142
stage('Publish JDK (Java.next) + MongoDB 8.0') {
6243
when {
6344
anyOf {
64-
changeset "ci/openjdk17-mongodb-8.0/**"
45+
changeset "ci/openjdk24-mongodb-8.0/**"
6546
changeset "ci/pipeline.properties"
6647
}
6748
}
@@ -70,7 +51,7 @@ pipeline {
7051

7152
steps {
7253
script {
73-
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/openjdk23-mongodb-8.0/")
54+
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/openjdk24-mongodb-8.0/")
7455
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7556
image.push()
7657
}
@@ -99,7 +80,7 @@ pipeline {
9980
steps {
10081
script {
10182
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
102-
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
83+
docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
10384
sh 'ci/start-replica.sh'
10485
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
10586
"./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"
@@ -118,27 +99,6 @@ pipeline {
11899
}
119100
}
120101
parallel {
121-
stage("test: MongoDB 7.0 (main)") {
122-
agent {
123-
label 'data'
124-
}
125-
options { timeout(time: 30, unit: 'MINUTES') }
126-
environment {
127-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
128-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
129-
}
130-
steps {
131-
script {
132-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
133-
docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
134-
sh 'ci/start-replica.sh'
135-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
136-
"./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"
137-
}
138-
}
139-
}
140-
}
141-
}
142102

143103
stage("test: MongoDB 8.0") {
144104
agent {

ci/openjdk17-mongodb-6.0/Dockerfile

-25
This file was deleted.

ci/openjdk17-mongodb-7.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.6.0.version=6.0.23
11-
docker.mongodb.7.0.version=7.0.20
1210
docker.mongodb.8.0.version=8.0.9
1311

1412
# Supported versions of Redis

0 commit comments

Comments
 (0)