From 5853c2ca0732dba6abc64457ff7dba5e682318ee Mon Sep 17 00:00:00 2001
From: Dassi Orleando <me@dassiorleando.xyz>
Date: Wed, 27 Dec 2017 06:46:22 +0100
Subject: [PATCH] BAEL-720: better handle failed tests in Jenkins pipeline

---
 .../scripted-pipeline-unix-nonunix            | 56 +++++++++++--------
 .../test/java/com/baeldung/SomeUnitTest.java  |  2 +-
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix b/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix
index fab940ad3d..b76bb8a81a 100644
--- a/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix
+++ b/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix
@@ -31,38 +31,48 @@ node {
 
         stage("Tests and Deployment") {
             parallel 'Unit tests': {
-                stage("Runing unit tests") {
-                    if (isUnix()) {
-                        sh "./mvnw test -Punit"
-                    } else {
-                        bat "./mvnw.cmd test -Punit"
+                stage("Running unit tests") {
+                    try {
+                        if (isUnix()) {
+                            sh "./mvnw test -Punit"
+                        } else {
+                            bat "./mvnw.cmd test -Punit"
+                        }
+                    } catch(err) {
+                        step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml'])
+                        throw err
                     }
                     step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml'])
 
                 }
             }, 'Integration tests': {
-                stage("Runing integration tests") {
-                    if (isUnix()) {
-                        sh "./mvnw test -Pintegration"
-                    } else {
-                        bat "./mvnw.cmd test -Pintegration"
+                stage("Running integration tests") {
+                    try {
+                        if (isUnix()) {
+                            sh "./mvnw test -Pintegration"
+                        } else {
+                            bat "./mvnw.cmd test -Pintegration"
+                        }
+                    } catch(err) {
+                        step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml'])
+                        throw err
                     }
                     step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml'])
                 }
-            }, 'Deployment': {
-                stage("Staging") {
-                    if (isUnix()) {
-                        sh "pid=\$(lsof -i:8989 -t); kill -TERM \$pid || kill -KILL \$pid"
-                    } else {
-                        bat "FOR /F \"tokens=5 delims= \" %%G IN (\"netstat -a | findstr :8989\") DO TaskKill.exe /PID %%G /fi \"memusage gt 0\""
-                    }
+            }
 
-                    withEnv(['JENKINS_NODE_COOKIE=dontkill']) {
-                        if (isUnix()) {
-                            sh 'nohup ./mvnw spring-boot:run -Dserver.port=8989 &'
-                        } else {
-                            bat 'start ./mvnw.cmd spring-boot:run -Dserver.port=8989'
-                        }
+            stage("Staging") {
+                if (isUnix()) {
+                    sh "pid=\$(lsof -i:8989 -t); kill -TERM \$pid || kill -KILL \$pid"
+                } else {
+                    bat "FOR /F \"tokens=5 delims= \" %%G IN (\"netstat -a | findstr :8989\") DO TaskKill.exe /PID %%G /fi \"memusage gt 0\""
+                }
+
+                withEnv(['JENKINS_NODE_COOKIE=dontkill']) {
+                    if (isUnix()) {
+                        sh 'nohup ./mvnw spring-boot:run -Dserver.port=8989 &'
+                    } else {
+                        bat 'start ./mvnw.cmd spring-boot:run -Dserver.port=8989'
                     }
                 }
             }
diff --git a/spring-jenkins-pipeline/src/test/java/com/baeldung/SomeUnitTest.java b/spring-jenkins-pipeline/src/test/java/com/baeldung/SomeUnitTest.java
index 1e0fc985c3..ea317ed7cd 100644
--- a/spring-jenkins-pipeline/src/test/java/com/baeldung/SomeUnitTest.java
+++ b/spring-jenkins-pipeline/src/test/java/com/baeldung/SomeUnitTest.java
@@ -6,6 +6,6 @@ import static org.junit.Assert.*;
 public class SomeUnitTest {
     @Test
     public void init() {
-        assertEquals(1, 0);
+        assertEquals(1, 1);
     }
 }