You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/07/26 18:12:07 UTC

[logging-pipelines] branch master updated: Fix Windows CI build

This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-pipelines.git


The following commit(s) were added to refs/heads/master by this push:
     new 568e2aa  Fix Windows CI build
568e2aa is described below

commit 568e2aa432474c1cf9cab67c90fc80ce6ffbc588
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sun Jul 26 13:11:43 2020 -0500

    Fix Windows CI build
---
 log4j/Jenkinsfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/log4j/Jenkinsfile b/log4j/Jenkinsfile
index c4db1ff..d5d474d 100644
--- a/log4j/Jenkinsfile
+++ b/log4j/Jenkinsfile
@@ -72,7 +72,7 @@ pipeline {
             parallel {
                 stage('Ubuntu') {
                     steps {
-                        sh 'mvn --fail-at-end --toolchains toolchains-jenkins-ubuntu.xml -Djenkins verify'
+                        sh 'mvn --toolchains toolchains-jenkins-ubuntu.xml -Djenkins -Dmaven.test.failure.ignore=true verify'
                     }
                     post {
                         always {
@@ -94,12 +94,18 @@ pipeline {
                         // https://cwiki.apache.org/confluence/display/INFRA/Jenkins+node+labels
                         label 'Windows'
                     }
+                    tools {
+                        // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
+                        jdk 'JDK 1.8 (latest)'
+                        // https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
+                        maven 'Maven 3 (latest)'
+                    }
                     steps {
                         // note that previous test runs of log4j-mongodb* may have left behind an embedded mongo folder
                         // also note that we don't need to use the jenkins system property here as it's ubuntu-specific
                         bat '''
                     if exist %userprofile%\\.embedmongo\\ rd /s /q %userprofile%\\.embedmongo
-                    mvn --show-version --fail-at-end --toolchains toolchains-jenkins-win.xml clean install
+                    mvn --toolchains toolchains-jenkins-win.xml -Dmaven.test.failure.ignore=true clean install
                     '''
                     }
                     post {