[sling-ide-tooling] branch feature/SLING-7597 updated: SLING-7597 - Investigate setting up Windows testing

[rombert]

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

rombert pushed a commit to branch feature/SLING-7597
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git


The following commit(s) were added to refs/heads/feature/SLING-7597 by this 
push:
     new dd0fd1e  SLING-7597 - Investigate setting up Windows testing
dd0fd1e is described below

commit dd0fd1e32879303496d6f835bb9535f6bf3b9ca1
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Wed Feb 27 11:25:11 2019 +0100

    SLING-7597 - Investigate setting up Windows testing
    
    Attempt to ignore Windows failures at individual stage level.
---
 Jenkinsfile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d44a10a..ca15276 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,7 +48,11 @@ def generateStages(String os, def mvnVersion, def 
javaVersion) {
                             sh 'mvn -f eclipse clean verify -Ddebug'
                         }
                     } else {
-                        bat 'mvn -f eclipse clean verify -Ddebug'
+                        try {
+                            bat 'mvn -f eclipse clean verify -Ddebug'
+                        } catch (ignored) {
+                            echo "Ignoring Windows failure for now: 
${e.message}"
+                        }
                     }
                     // workaround for 
https://issues.jenkins-ci.org/browse/JENKINS-55889
                     junit 'eclipse/**/surefire-reports/*.xml' 
@@ -60,11 +64,7 @@ def generateStages(String os, def mvnVersion, def 
javaVersion) {
 
     if ( os == "windows") {
         return node('Windows') {
-            try {
-                stages
-            } catch (ignored) {
-                echo "Ignoring Windows failure for now: ${e.message}"
-            }
+            stages
         }
     }
 
@@ -75,6 +75,10 @@ def runCmd(def cmd) {
     if (isUnix() ) {
         sh cmd
     } else {
-        bat cmd
+        try {
+            bat cmd
+        } catch (ignored) {
+            echo "Ignoring Windows failure for now: ${e.message}"
+        }
     }
 }
\ No newline at end of file