From fa70abeaa951dbc622d00ef793e14eb6ee4146ef Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 11 Jan 2023 21:42:36 +0100
Subject: [PATCH 1/3] Jenkinsfile: pickup results from ITs

---
 Jenkinsfile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f4c683335ca4..ae64a963b74f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,7 +48,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
 
         stage('Build / Unit Test') {
             String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
-            String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
+            String mvnName = 'maven_latest'
             try {
                 withEnv(["JAVA_HOME=${ tool "$jdkName" }",
                          "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool "$mvnName"}/bin",
@@ -56,11 +56,11 @@ node(jenkinsEnv.nodeSelection(osNode)) {
                     sh "mvn clean ${MAVEN_GOAL} -B -U -e -fae -V -Dmaven.test.failure.ignore -PversionlessMavenDist -Dmaven.repo.local=${WORK_DIR}/.repository"
                 }
             } finally {
-                junit testResults: '**/target/surefire-reports/*.xml', allowEmptyResults: true                
+                junit testResults: '**/target/surefire-reports/*.xml,**/target/failsafe-reports/*.xml', allowEmptyResults: true
             }
             dir ('apache-maven/target') {
                 stash includes: 'apache-maven-bin.zip', name: 'maven-dist'
-            }            
+            }
         }
     }
 }
@@ -70,7 +70,7 @@ for (String os in runITsOses) {
     for (def jdk in runITsJdks) {
         String osLabel = jenkinsEnv.labelForOS(os);
         String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
-        String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}")
+        String mvnName = 'maven_latest'
         echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}"
 
         String stageId = "${os}-jdk${jdk}"
@@ -111,7 +111,9 @@ for (String os in runITsOses) {
                                 }
                             }
                         } finally {
-                            //junit testResults: '**/core-it-suite/**/target/surefire-reports/*.xml', allowEmptyResults: true                                            
+                            // in ITs test we need only reports from test itself
+                            // test projects can contain reports with tested failed builds
+                            junit testResults: '**/core-it-suite/target/surefire-reports/*.xml,**/core-it-support/**/target/surefire-reports/*.xml', allowEmptyResults: true
                             archiveDirs(stageId, ['core-it-suite-logs':'core-it-suite/target/test-classes',
                                                   'core-it-suite-reports':'core-it-suite/target/surefire-reports'])
                             deleteDir() // clean up after ourselves to reduce disk space

From a91e2389e1c2cc284ca8dd8addd3cc05fa8216e9 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 11 Jan 2023 21:55:48 +0100
Subject: [PATCH 2/3] Try maven_3_latest

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ae64a963b74f..28f4a533e73c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,7 +48,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
 
         stage('Build / Unit Test') {
             String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
-            String mvnName = 'maven_latest'
+            String mvnName = 'maven_3_latest'
             try {
                 withEnv(["JAVA_HOME=${ tool "$jdkName" }",
                          "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool "$mvnName"}/bin",
@@ -70,7 +70,7 @@ for (String os in runITsOses) {
     for (def jdk in runITsJdks) {
         String osLabel = jenkinsEnv.labelForOS(os);
         String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
-        String mvnName = 'maven_latest'
+        String mvnName = 'maven_3_latest'
         echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}"
 
         String stageId = "${os}-jdk${jdk}"

From f606d97e7cda092669c043e3531c6c3ed808839b Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 11 Jan 2023 22:25:17 +0100
Subject: [PATCH 3/3] Revert maven_3_latest - ues defined variable

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 28f4a533e73c..77c6d7c3aa00 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,7 +48,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
 
         stage('Build / Unit Test') {
             String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
-            String mvnName = 'maven_3_latest'
+            String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
             try {
                 withEnv(["JAVA_HOME=${ tool "$jdkName" }",
                          "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool "$mvnName"}/bin",
@@ -70,7 +70,7 @@ for (String os in runITsOses) {
     for (def jdk in runITsJdks) {
         String osLabel = jenkinsEnv.labelForOS(os);
         String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
-        String mvnName = 'maven_3_latest'
+        String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}")
         echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}"
 
         String stageId = "${os}-jdk${jdk}"