This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.40.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 54908c200986bb5f5224c84a280735d9148fe46b Author: James Netherton <[email protected]> AuthorDate: Fri Sep 25 08:56:47 2026 +0100 Skip MinIO testing unless minio.container.image property is provided --- integration-tests/minio/pom.xml | 5 +++++ .../camel/quarkus/component/minio/it/MinioIT.java | 2 ++ .../quarkus/component/minio/it/MinioTest.java | 2 ++ .../component/minio/it/MinioTestResource.java | 23 +++++++++++----------- pom.xml | 1 - 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/integration-tests/minio/pom.xml b/integration-tests/minio/pom.xml index f8e37977c4..7f2bc2a03f 100644 --- a/integration-tests/minio/pom.xml +++ b/integration-tests/minio/pom.xml @@ -60,6 +60,11 @@ <artifactId>testcontainers</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-integration-test-support</artifactId> + <scope>test</scope> + </dependency> </dependencies> <profiles> diff --git a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioIT.java b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioIT.java index 5a57f4b8cb..2f5edf11de 100644 --- a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioIT.java +++ b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioIT.java @@ -17,8 +17,10 @@ package org.apache.camel.quarkus.component.minio.it; import io.quarkus.test.junit.QuarkusIntegrationTest; +import org.apache.camel.quarkus.test.EnabledIfProperty; @QuarkusIntegrationTest +@EnabledIfProperty(named = "minio.container.image", matches = ".+") class MinioIT extends MinioTest { } diff --git a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java index b83de6521c..701448a3c9 100644 --- a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java +++ b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java @@ -37,6 +37,7 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.apache.camel.component.minio.MinioConstants; import org.apache.camel.component.minio.MinioOperations; +import org.apache.camel.quarkus.test.EnabledIfProperty; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.both; @@ -48,6 +49,7 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest +@EnabledIfProperty(named = "minio.container.image", matches = ".+") @QuarkusTestResource(MinioTestResource.class) class MinioTest { private static final long PART_SIZE = 50 * 1024 * 1024; diff --git a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java index a7b2bad49d..f60a5ecf97 100644 --- a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java +++ b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java @@ -29,22 +29,23 @@ public class MinioTestResource implements QuarkusTestResourceLifecycleManager { public static final String CONTAINER_ACCESS_KEY = "MINIO_ROOT_USER"; public static final String CONTAINER_SECRET_KEY = "MINIO_ROOT_PASSWORD"; - private static final String CONTAINER_IMAGE = ConfigProvider.getConfig().getValue("minio.container.image", String.class); private static final int BROKER_PORT = 9000; private String endpoint; - private GenericContainer minioServer = new GenericContainer(CONTAINER_IMAGE) - .withEnv(CONTAINER_ACCESS_KEY, MinioResource.SERVER_ACCESS_KEY) - .withEnv(CONTAINER_SECRET_KEY, MinioResource.SERVER_SECRET_KEY) - .withCommand("server /data") - .withExposedPorts(BROKER_PORT) - .waitingFor(new HttpWaitStrategy() - .forPath("/minio/health/ready") - .forPort(BROKER_PORT) - .withStartupTimeout(Duration.ofSeconds(10))); + private GenericContainer minioServer; @Override public Map<String, String> start() { + String imageName = ConfigProvider.getConfig().getValue("minio.container.image", String.class); + minioServer = new GenericContainer(imageName) + .withEnv(CONTAINER_ACCESS_KEY, MinioResource.SERVER_ACCESS_KEY) + .withEnv(CONTAINER_SECRET_KEY, MinioResource.SERVER_SECRET_KEY) + .withCommand("server /data") + .withExposedPorts(BROKER_PORT) + .waitingFor(new HttpWaitStrategy() + .forPath("/minio/health/ready") + .forPort(BROKER_PORT) + .withStartupTimeout(Duration.ofSeconds(10))); minioServer.start(); String port = minioServer.getMappedPort(BROKER_PORT) + ""; @@ -57,7 +58,7 @@ public class MinioTestResource implements QuarkusTestResourceLifecycleManager { @Override public void stop() { - if (minioServer.isRunning()) { + if (minioServer != null && minioServer.isRunning()) { minioServer.stop(); } } diff --git a/pom.xml b/pom.xml index a08ee74d6f..a93a80f8b8 100644 --- a/pom.xml +++ b/pom.xml @@ -266,7 +266,6 @@ <lra-coordinator.container.image>quay.io/jbosstm/lra-coordinator:7.0.1.Final-3.8.3</lra-coordinator.container.image> <mariadb.container.image>mirror.gcr.io/mariadb:12.2-ubi</mariadb.container.image> <milvus.container.image>mirror.gcr.io/milvusdb/milvus:v2.6.21</milvus.container.image> - <minio.container.image>quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z-cpuv1</minio.container.image> <mongodb.container.image>mirror.gcr.io/mongo:7.0</mongodb.container.image> <mysql.container.image>mirror.gcr.io/mysql:9.5</mysql.container.image> <nats.container.image>mirror.gcr.io/nats:2.14.2</nats.container.image>
