This is an automated email from the ASF dual-hosted git repository. baedke pushed a commit to branch issue/oak-10775 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/issue/oak-10775 by this push: new 2321f5521c OAK-10775: LeaseUpdateSocketTimeoutIT still wants a mongo:4.2 image 2321f5521c is described below commit 2321f5521c473ff7c158cfd838111588c5b3c02a Author: Manfred Baedke <manfred.bae...@gmail.com> AuthorDate: Mon Apr 22 16:23:29 2024 +0200 OAK-10775: LeaseUpdateSocketTimeoutIT still wants a mongo:4.2 image Now uses the image name from MongoDockerRule. --- .../oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java | 4 +--- .../apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java index bb04c6ab8b..996472acfb 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java @@ -55,8 +55,6 @@ public class LeaseUpdateSocketTimeoutIT { private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.6.0"); - private static final DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.2"); - private static final int MONGODB_DEFAULT_PORT = 27017; private static final int LEASE_SO_TIMEOUT = 50; @@ -65,7 +63,7 @@ public class LeaseUpdateSocketTimeoutIT { public Network network = Network.newNetwork(); @Rule - public MongoDBContainer mongoDBContainer = new MongoDBContainer(MONGODB_IMAGE) + public MongoDBContainer mongoDBContainer = new MongoDBContainer(MongoDockerRule.getDockerImageName()) .withNetwork(network) .withNetworkAliases("mongo") .withExposedPorts(MONGODB_DEFAULT_PORT); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java index 20fe2d75f4..95b86550d0 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java @@ -132,4 +132,6 @@ public class MongoDockerRule extends ExternalResource { public static boolean isDockerAvailable() { return DOCKER_AVAILABLE; } + + public static DockerImageName getDockerImageName() { return DOCKER_IMAGE_NAME; } }