@@ -20,29 +20,10 @@ pipeline {
20
20
stages {
21
21
stage(" Docker images" ) {
22
22
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' ) {
43
24
when {
44
25
anyOf {
45
- changeset " ci/openjdk17 -mongodb-7 .0/**"
26
+ changeset " ci/openjdk24 -mongodb-8 .0/**"
46
27
changeset " ci/pipeline.properties"
47
28
}
48
29
}
@@ -51,7 +32,7 @@ pipeline {
51
32
52
33
steps {
53
34
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/" )
55
36
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
56
37
image. push()
57
38
}
@@ -61,7 +42,7 @@ pipeline {
61
42
stage(' Publish JDK (Java.next) + MongoDB 8.0' ) {
62
43
when {
63
44
anyOf {
64
- changeset " ci/openjdk17 -mongodb-8.0/**"
45
+ changeset " ci/openjdk24 -mongodb-8.0/**"
65
46
changeset " ci/pipeline.properties"
66
47
}
67
48
}
@@ -70,7 +51,7 @@ pipeline {
70
51
71
52
steps {
72
53
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/" )
74
55
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
75
56
image. push()
76
57
}
@@ -99,7 +80,7 @@ pipeline {
99
80
steps {
100
81
script {
101
82
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' ]) {
103
84
sh ' ci/start-replica.sh'
104
85
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
105
86
" ./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 {
118
99
}
119
100
}
120
101
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
- }
142
102
143
103
stage(" test: MongoDB 8.0" ) {
144
104
agent {
0 commit comments