[jackrabbit-oak] branch trunk updated: OAK-9827: Flaky test: SplitPersistenceBlobTest

[mr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mreutegg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 52e277397a OAK-9827: Flaky test: SplitPersistenceBlobTest
     new b905874954 Merge pull request #859 from mreutegg/OAK-9827
52e277397a is described below

commit 52e277397a4d5ca6e8b2886a7828aeb30470c945
Author: Marcel Reutegger <ma...@gmail.com>
AuthorDate: Fri Feb 24 14:20:59 2023 +0100

    OAK-9827: Flaky test: SplitPersistenceBlobTest
    
    Use a random suffix for test container name to prevent clashes when two modules are built on the same Jenkins worker.
---
 .../org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java
index 231a9adc5b..a5d4bd7ec7 100644
--- a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java
+++ b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java
@@ -33,6 +33,7 @@ import org.junit.runners.model.Statement;
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.util.UUID;
 
 public class AzuriteDockerRule implements TestRule {
 
@@ -41,12 +42,14 @@ public class AzuriteDockerRule implements TestRule {
     public static final String ACCOUNT_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
     public static final String ACCOUNT_NAME = "devstoreaccount1";
 
+    private static final String CONTAINER_SUFFIX = UUID.randomUUID().toString().substring(0, 8);
+
     private final DockerRule wrappedRule;
 
     public AzuriteDockerRule() {
         wrappedRule = new DockerRule(ImmutableDockerConfig.builder()
             .image(IMAGE)
-            .name("oak-test-azurite")
+            .name("oak-test-azurite-" + CONTAINER_SUFFIX)
             .ports("10000")
             .addStartedListener(container -> {
                 container.waitForPort("10000/tcp");