From 9d7473487fbd944d23af7933827441be59519083 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 8 Apr 2021 16:13:06 +0200 Subject: [PATCH] Upgrade to MongoDB 4.4 on CI. Closes #3612. --- Jenkinsfile | 24 +++++++++---------- .../Dockerfile | 6 ++--- .../Dockerfile | 6 ++--- ci/openjdk8-mongodb-4.0/Dockerfile | 2 +- .../Dockerfile | 8 ++++--- 5 files changed, 24 insertions(+), 22 deletions(-) rename ci/{openjdk11-mongodb-4.2 => openjdk11-mongodb-4.4}/Dockerfile (60%) rename ci/{openjdk15-mongodb-4.2 => openjdk15-mongodb-4.4}/Dockerfile (60%) rename ci/{openjdk8-mongodb-4.2 => openjdk8-mongodb-4.4}/Dockerfile (56%) diff --git a/Jenkinsfile b/Jenkinsfile index 27d5a07f77..570994b47a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,39 +23,39 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.0", "ci/openjdk8-mongodb-4.0/") + def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.0.23", "ci/openjdk8-mongodb-4.0/") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } } } } - stage('Publish JDK 8 + MongoDB 4.2') { + stage('Publish JDK 8 + MongoDB 4.4') { when { - changeset "ci/openjdk8-mongodb-4.2/**" + changeset "ci/openjdk8-mongodb-4.4/**" } agent { label 'data' } options { timeout(time: 30, unit: 'MINUTES') } steps { script { - def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.2.0", "ci/openjdk8-mongodb-4.2/") + def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.4.4", "ci/openjdk8-mongodb-4.4/") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } } } } - stage('Publish JDK 15 + MongoDB 4.2') { + stage('Publish JDK 15 + MongoDB 4.4') { when { - changeset "ci/openjdk15-mongodb-4.2/**" + changeset "ci/openjdk15-mongodb-4.4/**" } agent { label 'data' } options { timeout(time: 30, unit: 'MINUTES') } steps { script { - def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.2.0", "ci/openjdk15-mongodb-4.2/") + def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.4.4", "ci/openjdk15-mongodb-4.4/") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } @@ -79,7 +79,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-with-mongodb-4.2.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') { 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' @@ -108,7 +108,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-with-mongodb-4.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') { 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' @@ -121,7 +121,7 @@ pipeline { } } - stage("test: mongodb 4.2 (jdk8)") { + stage("test: mongodb 4.4 (jdk8)") { agent { label 'data' } @@ -129,7 +129,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-with-mongodb-4.2.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk8-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') { 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' @@ -150,7 +150,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk15-with-mongodb-4.2.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk15-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') { 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' diff --git a/ci/openjdk11-mongodb-4.2/Dockerfile b/ci/openjdk11-mongodb-4.4/Dockerfile similarity index 60% rename from ci/openjdk11-mongodb-4.2/Dockerfile rename to ci/openjdk11-mongodb-4.4/Dockerfile index 0d92eba78d..6c94ac38ff 100644 --- a/ci/openjdk11-mongodb-4.2/Dockerfile +++ b/ci/openjdk11-mongodb-4.4/Dockerfile @@ -5,11 +5,11 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \ - apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \ - 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; \ + apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \ + 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; \ echo ${TZ} > /etc/timezone; RUN apt-get update ; \ - 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 ; \ + 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 ; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*; diff --git a/ci/openjdk15-mongodb-4.2/Dockerfile b/ci/openjdk15-mongodb-4.4/Dockerfile similarity index 60% rename from ci/openjdk15-mongodb-4.2/Dockerfile rename to ci/openjdk15-mongodb-4.4/Dockerfile index 5f09d5c1d7..77e32d4c97 100644 --- a/ci/openjdk15-mongodb-4.2/Dockerfile +++ b/ci/openjdk15-mongodb-4.4/Dockerfile @@ -5,11 +5,11 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \ - apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \ - 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; \ + apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \ + 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; \ echo ${TZ} > /etc/timezone; RUN apt-get update ; \ - 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 ; \ + 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 ; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*; diff --git a/ci/openjdk8-mongodb-4.0/Dockerfile b/ci/openjdk8-mongodb-4.0/Dockerfile index 050a1797f5..e05068ab32 100644 --- a/ci/openjdk8-mongodb-4.0/Dockerfile +++ b/ci/openjdk8-mongodb-4.0/Dockerfile @@ -10,6 +10,6 @@ RUN RUN set -eux; \ echo ${TZ} > /etc/timezone; RUN apt-get update ; \ - 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 ; \ + 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 ; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*; diff --git a/ci/openjdk8-mongodb-4.2/Dockerfile b/ci/openjdk8-mongodb-4.4/Dockerfile similarity index 56% rename from ci/openjdk8-mongodb-4.2/Dockerfile rename to ci/openjdk8-mongodb-4.4/Dockerfile index 846a10423b..79774dd269 100644 --- a/ci/openjdk8-mongodb-4.2/Dockerfile +++ b/ci/openjdk8-mongodb-4.4/Dockerfile @@ -5,11 +5,13 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \ - apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \ - 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; \ + apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \ + 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; \ echo ${TZ} > /etc/timezone; RUN apt-get update ; \ - 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 ; \ + ln -T /bin/true /usr/bin/systemctl ; \ + 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 ; \ + rm /usr/bin/systemctl ; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*;