NA: Reuse test containers (#173)

* [NA] Add log level env vars * NA: Reuse test containers
comet-ml · Sep 4, 2024 · c04d447 · c04d447
1 parent 6d9fd76
commit c04d447
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 38 deletions.
diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml
@@ -33,6 +33,8 @@ jobs:
                 cache: maven
 
             - name: Run Tests for backend
+              env:
+                TESTCONTAINERS_REUSE_ENABLE: true
               run: mvn clean test -Dmaven.test.failure.ignore=true
 
             - name: Publish Test Report

diff --git a/...opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/DatasetsResourceTest.java b/...opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/DatasetsResourceTest.java
@@ -55,7 +55,6 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -113,13 +112,10 @@ class DatasetsResourceTest {
 
     private static final TimeBasedEpochGenerator GENERATOR = Generators.timeBasedEpochGenerator();
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/...k-backend/src/test/java/com/comet/opik/api/resources/v1/priv/ExperimentsResourceTest.java b/...k-backend/src/test/java/com/comet/opik/api/resources/v1/priv/ExperimentsResourceTest.java
@@ -45,7 +45,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -102,13 +101,10 @@ class ExperimentsResourceTest {
 
     private static final TimeBasedEpochGenerator GENERATOR = Generators.timeBasedEpochGenerator();
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MY_SQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/...nd/src/test/java/com/comet/opik/api/resources/v1/priv/FeedbackDefinitionResourceTest.java b/...nd/src/test/java/com/comet/opik/api/resources/v1/priv/FeedbackDefinitionResourceTest.java
@@ -31,7 +31,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -78,10 +77,8 @@ class FeedbackDefinitionResourceTest {
     private static final String WORKSPACE_ID = UUID.randomUUID().toString();
     private static final String TEST_WORKSPACE = UUID.randomUUID().toString();
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
     @RegisterExtension

diff --git a/...opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/ProjectsResourceTest.java b/...opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/ProjectsResourceTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -69,10 +68,8 @@ class ProjectsResourceTest {
     private static final String WORKSPACE_ID = UUID.randomUUID().toString();
     private static final String TEST_WORKSPACE = UUID.randomUUID().toString();
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
     @RegisterExtension

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java
@@ -53,7 +53,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -108,11 +107,10 @@ class SpansResourceTest {
     public static final String WORKSPACE_ID = UUID.randomUUID().toString();
     private static final Random RANDOM = new Random();
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
-    @Container
+
     private static final MySQLContainer<?> MY_SQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
-    @Container
+
     private static final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/TracesResourceTest.java
@@ -51,7 +51,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -105,13 +104,10 @@ class TracesResourceTest {
     public static final String WORKSPACE_ID = UUID.randomUUID().toString();
     private static final String TEST_WORKSPACE = UUID.randomUUID().toString();
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/.../opik-backend/src/test/java/com/comet/opik/infrastructure/HealthCheckIntegrationTest.java b/.../opik-backend/src/test/java/com/comet/opik/infrastructure/HealthCheckIntegrationTest.java
@@ -13,7 +13,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -27,13 +26,10 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class HealthCheckIntegrationTest {
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/...end/src/test/java/com/comet/opik/infrastructure/auth/AuthModuleNoAuthIntegrationTest.java b/...end/src/test/java/com/comet/opik/infrastructure/auth/AuthModuleNoAuthIntegrationTest.java
@@ -16,7 +16,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -35,13 +34,10 @@ class AuthModuleNoAuthIntegrationTest {
 
     public static final String URL_TEMPLATE = "%s/v1/private/projects";
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/infrastructure/health/IsAliveE2ETest.java b/apps/opik-backend/src/test/java/com/comet/opik/infrastructure/health/IsAliveE2ETest.java
@@ -14,7 +14,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import ru.vyarus.dropwizard.guice.test.ClientSupport;
 import ru.vyarus.dropwizard.guice.test.jupiter.ext.TestDropwizardAppExtension;
@@ -26,13 +25,10 @@
 @DisplayName("Is Alive Resource Test")
 class IsAliveE2ETest {
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension

diff --git a/...src/test/java/com/comet/opik/infrastructure/redis/RedissonLockServiceIntegrationTest.java b/...src/test/java/com/comet/opik/infrastructure/redis/RedissonLockServiceIntegrationTest.java
@@ -10,7 +10,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,13 +28,10 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class RedissonLockServiceIntegrationTest {
 
-    @Container
     private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
 
-    @Container
     private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
 
-    @Container
     private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
 
     @RegisterExtension