trying to make CI work by using themp dir instead fo classdir

dlg99 · Jun 26, 2024 · a745071 · a745071
1 parent ac2aef5
commit a745071
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/...tegration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java b/...tegration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
@@ -264,6 +264,18 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s
                         }
                 ));
 
+        spec.volumeMounts.forEach((key, value) -> {
+            if (zkContainer != null) {
+                zkContainer.withFileSystemBind(key, value, BindMode.READ_WRITE);
+            }
+            csContainer.withFileSystemBind(key, value, BindMode.READ_WRITE);
+            proxyContainer.withFileSystemBind(key, value, BindMode.READ_WRITE);
+
+            bookieContainers.values().forEach(c -> c.withFileSystemBind(key, value, BindMode.READ_WRITE));
+            brokerContainers.values().forEach(c -> c.withFileSystemBind(key, value, BindMode.READ_WRITE));
+            workerContainers.values().forEach(c -> c.withFileSystemBind(key, value, BindMode.READ_WRITE));
+        });
+
         spec.classPathVolumeMounts.forEach((key, value) -> {
             if (zkContainer != null) {
                 zkContainer.withClasspathResourceMapping(key, value, BindMode.READ_WRITE);

diff --git a/...ation/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java b/...ation/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java
@@ -124,6 +124,12 @@ public class PulsarClusterSpec {
     @Builder.Default
     Map<String, String> classPathVolumeMounts = new TreeMap<>();
 
+    /**
+     * Provide a map of paths to mount as volumes inside the containers
+     */
+    @Builder.Default
+    Map<String, String> volumeMounts = new TreeMap<>();
+
     /**
      * Pulsar Test Image Name
      *

diff --git a/...src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarUpgradeDowngradeTest.java b/...src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarUpgradeDowngradeTest.java
@@ -33,6 +33,9 @@
 import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
 import org.apache.pulsar.tests.integration.topologies.PulsarClusterTestBase;
 import org.testng.annotations.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.stream.Stream;
 import static java.util.stream.Collectors.joining;
 import static org.testng.Assert.assertEquals;
@@ -45,12 +48,16 @@ public class PulsarUpgradeDowngradeTest extends PulsarClusterTestBase {
 
     @Test(timeOut=600_000)
     public void test_210() throws Exception {
-        testUpgradeDowngrade("pulsar2.10-upgrade", "apachepulsar/pulsar:2.10.0", PulsarContainer.DEFAULT_IMAGE_NAME);
+        Path tempDir = Files.createTempDirectory("pulsar2.10");
+        tempDir.toFile().deleteOnExit();
+        testUpgradeDowngrade(tempDir.toAbsolutePath().toString(), "apachepulsar/pulsar:2.10.0", PulsarContainer.DEFAULT_IMAGE_NAME);
     }
 
     @Test(timeOut=600_000)
     public void test_300() throws Exception {
-        testUpgradeDowngrade("pulsar3.0-upgrade", "apachepulsar/pulsar:3.0.5", PulsarContainer.DEFAULT_IMAGE_NAME);
+        Path tempDir = Files.createTempDirectory("pulsar3.0");
+        tempDir.toFile().deleteOnExit();
+        testUpgradeDowngrade(tempDir.toAbsolutePath().toString(), "apachepulsar/pulsar:3.0.5", PulsarContainer.DEFAULT_IMAGE_NAME);
     }
 
     private void testUpgradeDowngrade(String path, String imageOld, String imageNew) throws Exception {
@@ -63,7 +70,7 @@ private void testUpgradeDowngrade(String path, String imageOld, String imageNew)
                 .numBookies(2)
                 .numBrokers(1)
                 .clusterName(clusterName)
-                .classPathVolumeMounts(
+                .volumeMounts(
                         ImmutableMap.<String, String> builder()
                                 .put(path, "/pulsar/data")
                                 .build())
@@ -74,7 +81,7 @@ ImmutableMap.<String, String> builder()
                 .numBookies(2)
                 .numBrokers(1)
                 .clusterName(clusterName)
-                .classPathVolumeMounts(
+                .volumeMounts(
                         ImmutableMap.<String, String> builder()
                                 .put(path, "/pulsar/data")
                                 .build())

diff --git a/tests/integration/src/test/resources/pulsar2.10-upgrade/readme.txt b/tests/integration/src/test/resources/pulsar2.10-upgrade/readme.txt
diff --git a/tests/integration/src/test/resources/pulsar3.0-upgrade/readme.txt b/tests/integration/src/test/resources/pulsar3.0-upgrade/readme.txt