Use Docker in Docker CI setup.

mp911de · mp911de · commit 893cc064bd78 · 2024-10-09T14:13:07.000+02:00
See #4788
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -156,10 +156,10 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-						docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+						docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
 							sh 'ci/start-replica.sh'
 							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-								"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
+								"./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"
 						}
 					}
 				}
@@ -187,10 +187,10 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+								docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
 									sh 'ci/start-replica.sh'
 									sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-										"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
+										"./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"
 								}
 							}
 						}
@@ -209,10 +209,10 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+								docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
 									sh 'ci/start-replica.sh'
 									sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-										"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
+										"./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"
 								}
 							}
 						}
@@ -231,10 +231,10 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+								docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
 									sh 'ci/start-replica.sh'
 									sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-										"./mvnw -s settings.xml -Pmongo-4.x clean dependency:list test -Dsort -U -B -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false"
+										"./mvnw -s settings.xml -Pmongo-4.x -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B -Ddevelocity.cache.local.enabled=false -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Ddevelocity.cache.remote.enabled=false"
 								}
 							}
 						}
@@ -253,10 +253,10 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image("springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
+								docker.image("springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
 									sh 'ci/start-replica.sh'
 									sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-										"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
+										"./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,14 +275,10 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
-									sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
-									sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
-									sh 'sleep 10'
-									sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
-									sh 'sleep 15'
+								docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
+									sh 'ci/start-replica.sh'
 									sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-										"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
+										"./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"
 								}
 							}
 						}
@@ -310,15 +306,17 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
 							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
 									"./mvnw -s settings.xml -Pci,artifactory " +
+									"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
 									"-Dartifactory.server=${p['artifactory.url']} " +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +
 									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
 									"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
 									"-Dartifactory.build-name=spring-data-mongodb " +
 									"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb " +
 									"-Dmaven.test.skip=true clean deploy -U -B"
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,10 @@ pipeline {`
`156`	`156`	`steps {`
`157`	`157`	`script {`
`158`	`158`	`docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
`159`		`- docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {`
	`159`	`+ docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {`
`160`	`160`	`sh 'ci/start-replica.sh'`
`161`	`161`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`162`		`- "./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"`
	`162`	`+ "./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"`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`@@ -187,10 +187,10 @@ pipeline {`
`187`	`187`	`steps {`
`188`	`188`	`script {`
`189`	`189`	`docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
`190`		`- docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {`
	`190`	`+ docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {`
`191`	`191`	`sh 'ci/start-replica.sh'`
`192`	`192`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`193`		`- "./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"`
	`193`	`+ "./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"`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`}`
`@@ -209,10 +209,10 @@ pipeline {`
`209`	`209`	`steps {`
`210`	`210`	`script {`
`211`	`211`	`docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
`212`		`- docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {`
	`212`	`+ docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {`
`213`	`213`	`sh 'ci/start-replica.sh'`
`214`	`214`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`215`		`- "./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"`
	`215`	`+ "./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"`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`	`}`
`@@ -231,10 +231,10 @@ pipeline {`
`231`	`231`	`steps {`
`232`	`232`	`script {`
`233`	`233`	`docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
`234`		`- docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {`
	`234`	`+ docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {`
`235`	`235`	`sh 'ci/start-replica.sh'`
`236`	`236`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`237`		`- "./mvnw -s settings.xml -Pmongo-4.x clean dependency:list test -Dsort -U -B -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false"`
	`237`	`+ "./mvnw -s settings.xml -Pmongo-4.x -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B -Ddevelocity.cache.local.enabled=false -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Ddevelocity.cache.remote.enabled=false"`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`}`
`@@ -253,10 +253,10 @@ pipeline {`
`253`	`253`	`steps {`
`254`	`254`	`script {`
`255`	`255`	`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.basic']) {`
	`256`	`+ docker.image("springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {`
`257`	`257`	`sh 'ci/start-replica.sh'`
`258`	`258`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`259`		`- "./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"`
	`259`	`+ "./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"`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`	`}`
`@@ -275,14 +275,10 @@ pipeline {`
`275`	`275`	`steps {`
`276`	`276`	`script {`
`277`	`277`	`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.basic']) {`
`279`		`- sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'`
`280`		`- sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'`
`281`		`- sh 'sleep 10'`
`282`		`- sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'`
`283`		`- sh 'sleep 15'`
	`278`	`+ docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {`
	`279`	`+ sh 'ci/start-replica.sh'`
`284`	`280`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`285`		`- "./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"`
	`281`	`+ "./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"`
`286`	`282`	`}`
`287`	`283`	`}`
`288`	`284`	`}`
`@@ -310,15 +306,17 @@ pipeline {`
`310`	`306`	`steps {`
`311`	`307`	`script {`
`312`	`308`	`docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
`313`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`309`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
`314`	`310`	`sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`315`	`311`	`"./mvnw -s settings.xml -Pci,artifactory " +`
	`312`	`+ "-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +`
`316`	`313`	`"-Dartifactory.server=${p['artifactory.url']} " +`
`317`	`314`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`318`	`315`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`319`	`316`	`"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
`320`	`317`	`"-Dartifactory.build-name=spring-data-mongodb " +`
`321`	`318`	`"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
	`319`	`+ "-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb " +`
`322`	`320`	`"-Dmaven.test.skip=true clean deploy -U -B"`
`323`	`321`	`}`
`324`	`322`	`}`