Add buildName to cache rocks

tarantool · Jun 2, 2023 · d6f21a6 · d6f21a6
1 parent df4a7e9
commit d6f21a6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/...a/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java b/...a/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java
@@ -1,15 +1,14 @@
 package org.testcontainers.containers;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.exceptions.CartridgeTopologyException;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-
-import java.time.Duration;
-
 import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -21,17 +20,18 @@ public class TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest {
 
     @Container
     private static final TarantoolCartridgeContainer container =
-            new TarantoolCartridgeContainer(
-                    "Dockerfile",
-                    "cartridge/instances_fixedport.yml",
-                    "cartridge/topology_fixedport.lua")
-                    .withEnv("TARANTOOL_INSTANCES_FILE", "instances_fixedport.yml")
-                    .withStartupTimeout(Duration.ofSeconds(300))
-                    .withUseFixedPorts(true)
-                    .withAPIPort(18081)
-                    .withRouterPort(13301)
-                    .withLogConsumer(new Slf4jLogConsumer(
-                            LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.class)));
+        new TarantoolCartridgeContainer(
+            "Dockerfile",
+            "cartridge",
+            "cartridge/instances_fixedport.yml",
+            "cartridge/topology_fixedport.lua")
+            .withEnv("TARANTOOL_INSTANCES_FILE", "instances_fixedport.yml")
+            .withStartupTimeout(Duration.ofSeconds(300))
+            .withUseFixedPorts(true)
+            .withAPIPort(18081)
+            .withRouterPort(13301)
+            .withLogConsumer(new Slf4jLogConsumer(
+                LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.class)));
 
     @Test
     public void test_StaticClusterContainer_StartsSuccessfully_ifFilesAreCopied() throws Exception {
@@ -43,6 +43,7 @@ public void test_retryingSetupTopology_shouldWork() {
         try (TarantoolCartridgeContainer testContainer =
                  new TarantoolCartridgeContainer(
                      "Dockerfile",
+                     "cartridge",
                      "cartridge/instances.yml",
                      "cartridge/incorrect_topology.lua")
                      .withLogConsumer(new Slf4jLogConsumer(

diff --git a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlTest.java b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlTest.java
@@ -22,6 +22,7 @@ public class TarantoolCartridgeBootstrapFromYamlTest {
     private static final TarantoolCartridgeContainer container =
             new TarantoolCartridgeContainer(
                     "Dockerfile",
+                    "cartridge",
                     "cartridge/instances.yml",
                     "cartridge/replicasets.yml")
                     .withStartupTimeout(Duration.ofSeconds(300))