@@ -96,26 +96,7 @@ pipeline {
96
96
}
97
97
}
98
98
}
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' ) {
119
100
when {
120
101
anyOf {
121
102
changeset " ci/openjdk17-mongodb-8.0/**"
@@ -127,7 +108,7 @@ pipeline {
127
108
128
109
steps {
129
110
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/" )
131
112
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
132
113
image. push()
133
114
}
@@ -241,7 +222,7 @@ pipeline {
241
222
}
242
223
}
243
224
244
- stage(" test: MongoDB 7.0 (next )" ) {
225
+ stage(" test: MongoDB 7.0 (main )" ) {
245
226
agent {
246
227
label ' data'
247
228
}
@@ -253,7 +234,7 @@ pipeline {
253
234
steps {
254
235
script {
255
236
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' ]) {
257
238
sh ' ci/start-replica.sh'
258
239
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
259
240
" ./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 {
275
256
steps {
276
257
script {
277
258
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' ]) {
279
260
sh ' ci/start-replica.sh'
280
261
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
281
262
" ./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"
0 commit comments