diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java index 982c19bed475c..aa27268145693 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java @@ -149,6 +149,12 @@ public class TestConfig { @ConfigItem(defaultValue = "prod") String nativeImageProfile; + /** + * The profile to use when testing using {@code @QuarkusIntegrationTest} + */ + @ConfigItem(defaultValue = "prod") + String integrationTestProfile; + /** * Profile related test settings */ diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ConfigUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ConfigUtil.java index 248ff31f1bb31..2e77ecb7c9ea4 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ConfigUtil.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ConfigUtil.java @@ -38,4 +38,10 @@ public static Duration waitTimeValue(Config config) { .orElseGet(() -> config.getOptionalValue("quarkus.test.jar-wait-time", Duration.class) // legacy value .orElseGet(() -> Duration.ofSeconds(DEFAULT_WAIT_TIME_SECONDS))); } + + public static String integrationTestProfile(Config config) { + return config.getOptionalValue("quarkus.test.integration-test-profile", String.class) + .orElseGet(() -> config.getOptionalValue("quarkus.test.native-image-profile", String.class) + .orElse(null)); + } } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java index 039cf407c76d4..cf898e3fa53a8 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java @@ -45,7 +45,7 @@ public DockerContainerArtifactLauncher create(CreateContext context) { config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT), config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT), ConfigUtil.waitTimeValue(config), - config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null), + ConfigUtil.integrationTestProfile(config), ConfigUtil.argLineValue(config), context.devServicesLaunchResult(), containerImage, diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java index 2b90dc993e063..ef8cde8ffcd69 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java @@ -43,7 +43,7 @@ public JarArtifactLauncher create(CreateContext context) { config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT), config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT), ConfigUtil.waitTimeValue(config), - config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null), + ConfigUtil.integrationTestProfile(config), ConfigUtil.argLineValue(config), context.devServicesLaunchResult(), context.buildOutputDirectory().resolve(pathStr))); diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java index ec9d9f56039e8..7b994941c9a56 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java @@ -41,7 +41,7 @@ public NativeImageLauncher create(CreateContext context) { config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT), config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT), ConfigUtil.waitTimeValue(config), - config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null), + ConfigUtil.integrationTestProfile(config), ConfigUtil.argLineValue(config), context.devServicesLaunchResult(), System.getProperty("native.image.path"),