Revert "Container debugging profile" and update pr-*-functional-tests.yml files

Author: marki1an

.github/workflows/pr-functional-tests.yml

@@ -30,8 +30,4 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
-        run: mvn -B verify  \
-          -DskipUnitTests=true  \
-          -Drun-functional-tests=true \
-          -DdockerfileName=Dockerfile  \
-          --file extra/pom.xml
+        run: mvn -B verify -DskipUnitTests=true -Drun-functional-tests=true -DdockerfileName=Dockerfile --file extra/pom.xml

.github/workflows/pr-module-functional-tests.yml

@@ -30,13 +30,7 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
-        run: mvn package  \
-          -DskipUnitTests=true   \
-          --file extra/pom.xml
+        run: mvn package -DskipUnitTests=true --file extra/pom.xml
 
       - name: Run module tests
-        run: mvn -B verify \
-          -DskipUnitTests=true \
-          -Drun-module-functional-tests=true
-          -DdockerfileName=Dockerfile-modules \
-          --file extra/pom.xml
+        run: mvn -B verify -DskipUnitTests=true -Drun-module-functional-tests=true -DdockerfileName=Dockerfile-modules --file extra/pom.xml

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -372,7 +373,7 @@
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <systemPropertyVariables>
-                            <launchContainers>false</launchContainers>
+                            <launchContainers>true</launchContainers>
                         </systemPropertyVariables>
                         <skipTests>${skipUnitTests}</skipTests>
                         <excludeJUnit5Engines>spock</excludeJUnit5Engines>
@@ -385,11 +386,6 @@
                     <configuration>
                         <systemPropertyVariables>
                             <launchContainers>true</launchContainers>
-                            <mockserver.version>${mockserver.version}</mockserver.version>
-                            <pbs.version>${project.version}</pbs.version>
-                            <tests.max-container-count>5</tests.max-container-count>
-                            <!-- Run only one application container instance on fixed ports for debugging purposes -->
-                            <tests.fixed-container-ports>false</tests.fixed-container-ports>
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
@@ -589,6 +585,23 @@
     </build>
 
     <profiles>
+        <profile>
+            <!-- Run only one application container instance on fixed ports for debugging purposes -->
+            <id>Container debugging</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <tests.fixed-container-ports>true</tests.fixed-container-ports>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>Run general functional tests without modules</id>
             <activation>
@@ -624,6 +637,15 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <mockserver.version>${mockserver.version}</mockserver.version>
+                                <pbs.version>${project.version}</pbs.version>
+                                <tests.max-container-count>5</tests.max-container-count>
+                                <!-- Run only one application container instance on fixed ports for debugging purposes -->
+                                <tests.fixed-container-ports>false</tests.fixed-container-ports>
+                            </systemPropertyVariables>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>general-functional-tests</id>
@@ -680,6 +702,15 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <mockserver.version>${mockserver.version}</mockserver.version>
+                                <pbs.version>${project.version}</pbs.version>
+                                <tests.max-container-count>5</tests.max-container-count>
+                                <!-- Run only one application container instance on fixed ports for debugging purposes -->
+                                <tests.fixed-container-ports>false</tests.fixed-container-ports>
+                            </systemPropertyVariables>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>module-functional-tests</id>