Skip to content

Commit 6310b60

Browse files
committed
Adopt to upgraded MongoDB server version.
See #2474
1 parent 158128f commit 6310b60

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Jenkinsfile

+3-11
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ pipeline {
3838
steps {
3939
script {
4040
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
41-
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
42-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
43-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
44-
sh 'sleep 10'
45-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
46-
sh 'sleep 15'
41+
docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
42+
sh 'ci/start-replica.sh'
4743
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
4844
'./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-rest clean dependency:list test -Dsort -U -B -Pit'
4945
}
@@ -74,11 +70,7 @@ pipeline {
7470
script {
7571
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
7672
docker.image("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
77-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
78-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
79-
sh 'sleep 10'
80-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
81-
sh 'sleep 15'
73+
sh 'ci/start-replica.sh'
8274
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
8375
'./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-rest clean dependency:list test -Dsort -U -B -Pit'
8476
}

ci/start-replica.sh

+6
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+
mongosh --eval "rs.initiate({_id: 'rs0', members:[{_id: 0, host: '127.0.0.1:27017'}]});"
6+
sleep 15

0 commit comments

Comments
 (0)