Skip to content

Commit 2dc8ffc

Browse files
mp911demp911de
committed
Use Docker in Docker CI setup.
See #4788
1 parent 8b9182e commit 2dc8ffc

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

‎Jenkinsfile‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ pipeline {
156156
steps {
157157
script {
158158
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']) {
160-
sh 'ci/start-replica.sh'
159+
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
160+
sh 'ci/start-replica-4.x.sh'
161161
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"
163163
}
164164
}
165165
}
@@ -187,10 +187,10 @@ pipeline {
187187
steps {
188188
script {
189189
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']) {
191-
sh 'ci/start-replica.sh'
190+
docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
191+
sh 'ci/start-replica-4.x.sh'
192192
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"
194194
}
195195
}
196196
}
@@ -209,10 +209,10 @@ pipeline {
209209
steps {
210210
script {
211211
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']) {
213213
sh 'ci/start-replica.sh'
214214
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"
216216
}
217217
}
218218
}
@@ -231,10 +231,10 @@ pipeline {
231231
steps {
232232
script {
233233
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']) {
235235
sh 'ci/start-replica.sh'
236236
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"
238238
}
239239
}
240240
}
@@ -253,10 +253,10 @@ pipeline {
253253
steps {
254254
script {
255255
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']) {
257257
sh 'ci/start-replica.sh'
258258
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"
260260
}
261261
}
262262
}
@@ -275,14 +275,10 @@ pipeline {
275275
steps {
276276
script {
277277
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'
284280
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"
286282
}
287283
}
288284
}
@@ -310,15 +306,17 @@ pipeline {
310306
steps {
311307
script {
312308
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']) {
314310
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
315311
"./mvnw -s settings.xml -Pci,artifactory " +
312+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
316313
"-Dartifactory.server=${p['artifactory.url']} " +
317314
"-Dartifactory.username=${ARTIFACTORY_USR} " +
318315
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
319316
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
320317
"-Dartifactory.build-name=spring-data-mongodb " +
321318
"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
319+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb " +
322320
"-Dmaven.test.skip=true clean deploy -U -B"
323321
}
324322
}

‎ci/start-replica-4.x.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
mkdir -p /tmp/mongodb/db /tmp/mongodb/log
3+
mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &
4+
sleep 10
5+
mongo --eval "rs.initiate({_id: 'rs0', members:[{_id: 0, host: '127.0.0.1:27017'}]});"
6+
sleep 15

0 commit comments

Comments
 (0)