@@ -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"
0 commit comments