From 580fc80fce9ecafa3a0cf61d6d07382d9c6b39f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0irok=C3=BD?= Date: Wed, 11 Jan 2023 19:57:16 +0100 Subject: [PATCH 1/4] Jenkinsfile: pickup results from ITs --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2934e9b6bcac..29daef8b2416 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ 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' @@ -112,7 +112,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 2f782d12f4ca63400a4e049fcc41077d624f4e1c Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Wed, 11 Jan 2023 20:40:12 +0100 Subject: [PATCH 2/4] Use maven_latest for build --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29daef8b2416..32af617332ee 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", @@ -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}" From 36eface53ae5ff521e49c741f45ffac8886483a7 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Wed, 11 Jan 2023 21:04:59 +0100 Subject: [PATCH 3/4] Use maven_latest for build --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32af617332ee..9eb8c3ea4bb8 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_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_latest' echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" String stageId = "${os}-jdk${jdk}" From 665d9ddb13942501ff7348407c693e6eee17f828 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Wed, 11 Jan 2023 23:00:04 +0100 Subject: [PATCH 4/4] Use Maven 3.8.x --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9eb8c3ea4bb8..a57cd876a11f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,10 +21,10 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' -def buildMvn = '3.6.3' +def buildMvn = '3.8.x' def runITsOses = ['linux'] def runITsJdks = ['8', '11', '17'] -def runITsMvn = '3.6.3' +def runITsMvn = '3.8.x' def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def tests @@ -48,7 +48,7 @@ node(jenkinsEnv.nodeSelection(osNode)) { stage('Build / Unit Test') { String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk) - String mvnName = 'maven_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_latest' + String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" String stageId = "${os}-jdk${jdk}"