Skip to content

Commit 9d74734

Browse files
mp911demp911de
committed
Upgrade to MongoDB 4.4 on CI.
Closes #3612.
1 parent 2734a7d commit 9d74734

File tree

5 files changed

+24
-22
lines changed

5 files changed

+24
-22
lines changed

‎Jenkinsfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ pipeline {
2323

2424
steps {
2525
script {
26-
def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.0", "ci/openjdk8-mongodb-4.0/")
26+
def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.0.23", "ci/openjdk8-mongodb-4.0/")
2727
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
2828
image.push()
2929
}
3030
}
3131
}
3232
}
33-
stage('Publish JDK 8 + MongoDB 4.2') {
33+
stage('Publish JDK 8 + MongoDB 4.4') {
3434
when {
35-
changeset "ci/openjdk8-mongodb-4.2/**"
35+
changeset "ci/openjdk8-mongodb-4.4/**"
3636
}
3737
agent { label 'data' }
3838
options { timeout(time: 30, unit: 'MINUTES') }
3939

4040
steps {
4141
script {
42-
def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.2.0", "ci/openjdk8-mongodb-4.2/")
42+
def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.4.4", "ci/openjdk8-mongodb-4.4/")
4343
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
4444
image.push()
4545
}
4646
}
4747
}
4848
}
49-
stage('Publish JDK 15 + MongoDB 4.2') {
49+
stage('Publish JDK 15 + MongoDB 4.4') {
5050
when {
51-
changeset "ci/openjdk15-mongodb-4.2/**"
51+
changeset "ci/openjdk15-mongodb-4.4/**"
5252
}
5353
agent { label 'data' }
5454
options { timeout(time: 30, unit: 'MINUTES') }
5555

5656
steps {
5757
script {
58-
def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.2.0", "ci/openjdk15-mongodb-4.2/")
58+
def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.4.4", "ci/openjdk15-mongodb-4.4/")
5959
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6060
image.push()
6161
}
@@ -79,7 +79,7 @@ pipeline {
7979
steps {
8080
script {
8181
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
82-
docker.image('springci/spring-data-openjdk8-with-mongodb-4.2.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
82+
docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') {
8383
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
8484
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
8585
sh 'sleep 10'
@@ -108,7 +108,7 @@ pipeline {
108108
steps {
109109
script {
110110
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
111-
docker.image('springci/spring-data-openjdk8-with-mongodb-4.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
111+
docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') {
112112
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
113113
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
114114
sh 'sleep 10'
@@ -121,15 +121,15 @@ pipeline {
121121
}
122122
}
123123

124-
stage("test: mongodb 4.2 (jdk8)") {
124+
stage("test: mongodb 4.4 (jdk8)") {
125125
agent {
126126
label 'data'
127127
}
128128
options { timeout(time: 30, unit: 'MINUTES') }
129129
steps {
130130
script {
131131
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
132-
docker.image('springci/spring-data-openjdk8-with-mongodb-4.2.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
132+
docker.image('springci/spring-data-openjdk8-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
133133
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
134134
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
135135
sh 'sleep 10'
@@ -150,7 +150,7 @@ pipeline {
150150
steps {
151151
script {
152152
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
153-
docker.image('springci/spring-data-openjdk15-with-mongodb-4.2.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
153+
docker.image('springci/spring-data-openjdk15-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
154154
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
155155
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
156156
sh 'sleep 10'

‎ci/openjdk11-mongodb-4.2/Dockerfile renamed to ‎ci/openjdk11-mongodb-4.4/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ENV DEBIAN_FRONTEND=noninteractive
55

66
RUN set -eux; \
77
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
8-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
9-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
8+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
9+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
1010
echo ${TZ} > /etc/timezone;
1111

1212
RUN apt-get update ; \
13-
apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
13+
apt-get install -y mongodb-org=4.4.4 mongodb-org-server=4.4.4 mongodb-org-shell=4.4.4 mongodb-org-mongos=4.4.4 mongodb-org-tools=4.4.4 ; \
1414
apt-get clean; \
1515
rm -rf /var/lib/apt/lists/*;

‎ci/openjdk15-mongodb-4.2/Dockerfile renamed to ‎ci/openjdk15-mongodb-4.4/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ENV DEBIAN_FRONTEND=noninteractive
55

66
RUN set -eux; \
77
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
8-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
9-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
8+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
9+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
1010
echo ${TZ} > /etc/timezone;
1111

1212
RUN apt-get update ; \
13-
apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
13+
apt-get install -y mongodb-org=4.4.4 mongodb-org-server=4.4.4 mongodb-org-shell=4.4.4 mongodb-org-mongos=4.4.4 mongodb-org-tools=4.4.4 ; \
1414
apt-get clean; \
1515
rm -rf /var/lib/apt/lists/*;

‎ci/openjdk8-mongodb-4.0/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ RUN RUN set -eux; \
1010
echo ${TZ} > /etc/timezone;
1111

1212
RUN apt-get update ; \
13-
apt-get install -y mongodb-org=4.0.14 mongodb-org-server=4.0.14 mongodb-org-shell=4.0.14 mongodb-org-mongos=4.0.14 mongodb-org-tools=4.0.14 ; \
13+
apt-get install -y mongodb-org=4.0.23 mongodb-org-server=4.0.23 mongodb-org-shell=4.0.23 mongodb-org-mongos=4.0.23 mongodb-org-tools=4.0.23 ; \
1414
apt-get clean; \
1515
rm -rf /var/lib/apt/lists/*;

‎ci/openjdk8-mongodb-4.2/Dockerfile renamed to ‎ci/openjdk8-mongodb-4.4/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ ENV DEBIAN_FRONTEND=noninteractive
55

66
RUN set -eux; \
77
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
8-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
9-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
8+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
9+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
1010
echo ${TZ} > /etc/timezone;
1111

1212
RUN apt-get update ; \
13-
apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
13+
ln -T /bin/true /usr/bin/systemctl ; \
14+
apt-get install -y mongodb-org=4.4.4 mongodb-org-server=4.4.4 mongodb-org-shell=4.4.4 mongodb-org-mongos=4.4.4 mongodb-org-tools=4.4.4 ; \
15+
rm /usr/bin/systemctl ; \
1416
apt-get clean; \
1517
rm -rf /var/lib/apt/lists/*;

0 commit comments

Comments
 (0)