From 13d30480c5b9144deb8904951af428b66fc5420a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 24 Feb 2022 16:17:48 +1000 Subject: [PATCH 1/2] avoid deep pattern for maven-invoker-plugin generated junit files --- vars/buildPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/buildPlugin.groovy b/vars/buildPlugin.groovy index 485b9e185..18711b780 100644 --- a/vars/buildPlugin.groovy +++ b/vars/buildPlugin.groovy @@ -115,7 +115,7 @@ def call(Map params = [:]) { infra.runMaven(mavenOptions, jdk, null, null, addToolEnv) } finally { if (!skipTests) { - junit('**/target/surefire-reports/**/*.xml,**/target/failsafe-reports/**/*.xml,**/target/invoker-reports/**/*.xml') + junit('**/target/surefire-reports/**/*.xml,**/target/failsafe-reports/**/*.xml,**/target/invoker-reports/TEST*.xml') if (first) { publishCoverage calculateDiffForChangeRequests: true, adapters: [jacocoAdapter('**/target/site/jacoco/jacoco.xml')] } From 8eb52bbe145b0f6b051b6de0cc31e5ae4d256559 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 24 Feb 2022 16:20:50 +1000 Subject: [PATCH 2/2] do not need such deep scanning as surefire files are in top directory. --- vars/buildPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/buildPlugin.groovy b/vars/buildPlugin.groovy index 18711b780..5bb16a24c 100644 --- a/vars/buildPlugin.groovy +++ b/vars/buildPlugin.groovy @@ -115,7 +115,7 @@ def call(Map params = [:]) { infra.runMaven(mavenOptions, jdk, null, null, addToolEnv) } finally { if (!skipTests) { - junit('**/target/surefire-reports/**/*.xml,**/target/failsafe-reports/**/*.xml,**/target/invoker-reports/TEST*.xml') + junit('**/target/surefire-reports/*.xml,**/target/failsafe-reports/*.xml,**/target/invoker-reports/TEST*.xml') if (first) { publishCoverage calculateDiffForChangeRequests: true, adapters: [jacocoAdapter('**/target/site/jacoco/jacoco.xml')] }