You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/01/13 11:00:53 UTC
[maven] branch master updated: Jenkinsfile: pickup results from ITs and Maven 3.8.x for build (#953)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new c0d942b56 Jenkinsfile: pickup results from ITs and Maven 3.8.x for build (#953)
c0d942b56 is described below
commit c0d942b56bd2fcb4f2a305501efaa7e5bb859cfb
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Jan 13 12:00:48 2023 +0100
Jenkinsfile: pickup results from ITs and Maven 3.8.x for build (#953)
Co-authored-by: Petr Široký <pe...@pm.me>
---
Jenkinsfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2934e9b6b..a57cd876a 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
@@ -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