merge: #8488

8488: [Backport stable/1.2] Fix junit report pattern r=deepthidevaki a=npepinpe ## Description Fixes the Jenkins junit plugin pattern used to detect test reports in our CI pipeline. The flaky test plugin will add a `-flaky` suffix, so we need to add an additional `*` to the pattern. Unfortunately as it's not a regex but simply an Ant glob pattern, there is no way to further restrict matches, so there's still the risk it could collide and double the test reports. (cherry picked from commit 76eb54e) ## Related issues relates to #8472 Co-authored-by: Nicolas Pepin-Perreault <[email protected]>
camunda · Dec 28, 2021 · b68b85b · b68b85b
2 parents 81cf8b3 + 6a637ad
commit b68b85b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -171,7 +171,8 @@ pipeline {
 
                     post {
                         always {
-                            junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}*.xml", keepLongStdio: true, allowEmptyResults: true
+                            junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}.xml", keepLongStdio: true, allowEmptyResults: true
+                            junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}-FLAKY.xml", keepLongStdio: true, allowEmptyResults: true
                         }
                     }
                 }
@@ -189,7 +190,8 @@ pipeline {
 
                     post {
                         always {
-                            junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}*.xml", keepLongStdio: true, allowEmptyResults: true
+                            junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}.xml", keepLongStdio: true, allowEmptyResults: true
+                            junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}-FLAKY.xml", keepLongStdio: true, allowEmptyResults: true
                         }
                     }
                 }
@@ -256,7 +258,8 @@ pipeline {
 
                             post {
                                 always {
-                                    junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}*.xml", keepLongStdio: true, allowEmptyResults: true
+                                    junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}.xml", keepLongStdio: true, allowEmptyResults: true
+                                    junit testResults: "**/*/TEST*${SUREFIRE_REPORT_NAME_SUFFIX}-FLAKY.xml", keepLongStdio: true, allowEmptyResults: true
                                     stash allowEmpty: true, name: itFlakyTestStashName, includes: '**/FlakyTests.txt'
                                 }