Include integration test results in Jacoco

integration-test module is not recording code coverage due to
incorrectly overriding the maven surefire config from parent pom.

Issue-ID: CPS-2086
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I774c64acedca546f5c01403597bd9f5010de73d2

3 files changed, 15 insertions, 35 deletions

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 2e81b004e1..6e7554bf5e 100644
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   Copyright (c) 2021 Pantheon.tech.
   Modifications Copyright (C) 2021 Bell Canada.
-  Modifications Copyright (C) 2021-2023 Nordix Foundation.
+  Modifications Copyright (C) 2021-2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -339,7 +339,10 @@
                         <include>**/*Test.java</include> <!-- Just in case of having also "normal" JUnit tests -->
                     </includes>
                     <excludes>
-                        <exclude>**/IT*.java</exclude>
+                        <!-- maven-failsafe-plugin will run performance tests in the integration-test module,
+                             so performance tests will not affect Jacoco coverage (jacoco-report module is configured
+                             to aggregate results from tests run with maven-surefire-plugin only) -->
+                        <exclude>**/*PerfTest.java</exclude>
                     </excludes>
                     <environmentVariables>
                         <!--
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 73998cd135..6947a94aaa 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -26,7 +26,6 @@
         <version>3.4.4-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>integration-test</artifactId>
@@ -90,49 +89,28 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xms512m -Xmx512m</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xms512m -Xmx512m</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
+        <!-- Performance tests are run with maven-failsafe-plugin using a separate profile, so they will
+             not affect Jacoco coverage. Heap size is set here to ensure consistent test environment. -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>include-performance</id>
+            <properties>
+                <failsafeArgLine>-Xms512m -Xmx512m</failsafeArgLine>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
-                            <excludes>
-                                <exclude>%regex[.*PerfTest.*]</exclude>
-                            </excludes>
+                            <includes>
+                                <include>**/*PerfTest.java</include>
+                            </includes>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>include-performance</id>
-        </profile>
     </profiles>
 
-
 </project>
diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy
index b455e69c36..ce0aab45b0 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy
@@ -21,7 +21,6 @@
 package org.onap.cps.integration.performance.base
 
 import org.onap.cps.integration.base.CpsIntegrationSpecBase
-import org.springframework.util.StopWatch
 
 abstract class PerfTestBase extends CpsIntegrationSpecBase {