Merge pull request quarkusio#47759 from geoand/quarkusio#47400

Update profile configuration for integration tests

Author: gsmet

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java

@@ -157,16 +157,10 @@ public interface TestConfig {
     @WithDefault("false")
     boolean flatClassPath();
 
-    /**
-     * The profile to use when testing the native image
-     */
-    @WithDefault("prod")
-    String nativeImageProfile();
-
     /**
      * The profile to use when testing using {@code @QuarkusIntegrationTest}
      */
-    @WithDefault("prod")
+    @WithDefault("${quarkus.profile:prod}")
     String integrationTestProfile();
 
     /**

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java

@@ -232,7 +232,10 @@ private QuarkusTestExtensionState doProcessStart(Properties quarkusArtifactPrope
             // propagate Quarkus properties set from the build tool
             Properties existingSysProps = System.getProperties();
             for (String name : existingSysProps.stringPropertyNames()) {
-                if (name.startsWith("quarkus.")) {
+                if (name.startsWith("quarkus.")
+                        // don't include 'quarkus.profile' as that has already been taken into account when determining the launch profile
+                        // so we don't want this to end up in multiple launch arguments
+                        && !name.equals("quarkus.profile")) {
                     additionalProperties.put(name, existingSysProps.getProperty(name));
                 }
             }

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java

@@ -144,7 +144,10 @@ private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, S
                 // propagate Quarkus properties set from the build tool
                 Properties existingSysProps = System.getProperties();
                 for (String name : existingSysProps.stringPropertyNames()) {
-                    if (name.startsWith("quarkus.")) {
+                    if (name.startsWith("quarkus.")
+                            // don't include 'quarkus.profile' as that has already been taken into account when determining the launch profile
+                            // so we don't want this to end up in multiple launch arguments
+                            && !name.equals("quarkus.profile")) {
                         additionalProperties.put(name, existingSysProps.getProperty(name));
                     }
                 }

test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java

@@ -155,8 +155,8 @@ static class DefaultDockerInitContext extends DefaultInitContextBase
         private final Map<Integer, Integer> additionalExposedPorts;
         private final Optional<String> entryPoint;
         private final List<String> programArgs;
-        private Map<String, String> labels;
-        private Map<String, String> volumeMounts;
+        private final Map<String, String> labels;
+        private final Map<String, String> volumeMounts;
 
         public DefaultDockerInitContext(int httpPort, int httpsPort, Duration waitTime, String testProfile,
                 List<String> argLine, Map<String, String> env,

test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java

@@ -45,7 +45,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),
                     testConfig.waitTime(),
-                    testConfig.nativeImageProfile(),
+                    testConfig.integrationTestProfile(),
                     TestConfigUtil.argLineValues(testConfig.argLine().orElse("")),
                     testConfig.env(),
                     context.devServicesLaunchResult(),