diff --git a/src/test/java/org/folio/dew/BaseBatchTest.java b/src/test/java/org/folio/dew/BaseBatchTest.java index ebbe319b2..fbd4231d2 100644 --- a/src/test/java/org/folio/dew/BaseBatchTest.java +++ b/src/test/java/org/folio/dew/BaseBatchTest.java @@ -109,7 +109,7 @@ public abstract class BaseBatchTest { @Value("${spring.application.name}") protected String springApplicationName; - public static final LocalStackContainer localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:4.10.0")) + public static final LocalStackContainer localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:s3-latest")) .withServices(S3) .withEnv("EAGER_SERVICE_LOADING", "1"); diff --git a/src/test/java/org/folio/dew/repository/BaseIntegration.java b/src/test/java/org/folio/dew/repository/BaseIntegration.java index 0f0fa9206..fd4d463bb 100644 --- a/src/test/java/org/folio/dew/repository/BaseIntegration.java +++ b/src/test/java/org/folio/dew/repository/BaseIntegration.java @@ -2,12 +2,10 @@ import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3; -import java.time.Duration; import lombok.extern.log4j.Log4j2; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; import org.testcontainers.containers.localstack.LocalStackContainer; -import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; @@ -18,15 +16,8 @@ public abstract class BaseIntegration { @Container public static final LocalStackContainer localstack - = new LocalStackContainer(DockerImageName.parse("localstack/localstack:4.10.0")) + = new LocalStackContainer(DockerImageName.parse("localstack/localstack:s3-latest")) .withServices(S3) - .waitingFor( - Wait.forHttp("/_localstack/health") - .forPort(4566) - .forStatusCode(200) - .forResponsePredicate(s -> s.contains("\"s3\": \"running\"")) - .withStartupTimeout(Duration.ofMinutes(1)) - ) .withEnv("EAGER_SERVICE_LOADING", "1");