You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/10/07 08:26:11 UTC
[jackrabbit-filevault-jenkins-lib] branch master updated: collect
surefire and failsafe reports
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 9688d1d collect surefire and failsafe reports
9688d1d is described below
commit 9688d1d005109bcb3b6d788fe4a4f093cf20c17b
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Oct 7 10:25:57 2021 +0200
collect surefire and failsafe reports
---
vars/fileVaultMavenStdBuild.groovy | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/vars/fileVaultMavenStdBuild.groovy b/vars/fileVaultMavenStdBuild.groovy
index a2513ff..69e1db7 100644
--- a/vars/fileVaultMavenStdBuild.groovy
+++ b/vars/fileVaultMavenStdBuild.groovy
@@ -47,18 +47,22 @@ def buildStage(final int jdkVersion, final String nodeLabel, final boolean isMai
timeout(60) {
echo "Running on node ${env.NODE_NAME}"
checkout scm
- String mavenArguments
- if (isMainBuild) {
- // clean must be executed separately as otherwise local staging directory (below target/nexus-staging) is overwritten (https://issues.sonatype.org/browse/NEXUS-29206)
- executeMaven(jdkLabel, 'clean', 'EXPLICIT')
- mavenArguments = "-U install site ${stagingPluginGav}:deploy -DskipRemoteStaging=true -Pjacoco-report -Dlogback.configurationFile=vault-core/src/test/resources/logback-only-errors.xml"
- } else {
- mavenArguments = '-U clean verify site'
- }
- executeMaven(jdkLabel, mavenArguments, 'IMPLICIT')
- if (isMainBuild && isOnMainBranch()) {
- // Stash the build results so we can deploy them on another node
- stash name: 'filevault-build-snapshots', includes: '**/nexus-staging/**'
+ try {
+ String mavenArguments
+ if (isMainBuild) {
+ // clean must be executed separately as otherwise local staging directory (below target/nexus-staging) is overwritten (https://issues.sonatype.org/browse/NEXUS-29206)
+ executeMaven(jdkLabel, 'clean', 'EXPLICIT')
+ mavenArguments = "-U install site ${stagingPluginGav}:deploy -DskipRemoteStaging=true -Pjacoco-report -Dlogback.configurationFile=vault-core/src/test/resources/logback-only-errors.xml"
+ } else {
+ mavenArguments = '-U clean verify site'
+ }
+ executeMaven(jdkLabel, mavenArguments, 'IMPLICIT')
+ if (isMainBuild && isOnMainBranch()) {
+ // Stash the build results so we can deploy them on another node
+ stash name: 'filevault-build-snapshots', includes: '**/nexus-staging/**'
+ }
+ } finally {
+ junit '**/target/surefire-reports/**/*.xml,**/target/failsafe-reports*/**/*.xml'
}
}
}