From 5670bb100393275de70fb8faaf38bdec2d8e8291 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Mon, 18 Dec 2017 15:33:26 -0800
Subject: [PATCH 1/3] Add no failure

---
 jenkins/Jenkinsfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index a70013f..4755c40 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -1,4 +1,7 @@
 pipeline {
+    options {
+        skipStagesAfterUnstable()
+    }
     agent {
         docker {
             image 'maven:3-alpine'
@@ -13,10 +16,10 @@ pipeline {
         }
         stage('Test') {
             steps {
-                sh 'mvn test'
+                sh 'mvn test -DtestFailureIgnore=true'
             }
             post {
-                always {
+                success {
                     junit 'target/surefire-reports/*.xml'
                 }
             }

From b03d1bfe31d61214ca4ed4dd840f2866697e315a Mon Sep 17 00:00:00 2001
From: Giles Gaskell <gilesgas@gmail.com>
Date: Tue, 19 Dec 2017 12:10:05 +1100
Subject: [PATCH 2/3] Update Jenkinsfile

Use Maven's "User Property" value as opposed to "parameter name" value.
---
 jenkins/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 4755c40..802c0e0 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
         }
         stage('Test') {
             steps {
-                sh 'mvn test -DtestFailureIgnore=true'
+                sh 'mvn test -Dmaven.test.failure.ignore=true'
             }
             post {
                 success {

From a4281b0b2559a4ca5cf383872f6e20179242b483 Mon Sep 17 00:00:00 2001
From: Giles Gaskell <gilesgas@gmail.com>
Date: Tue, 19 Dec 2017 14:45:31 +1100
Subject: [PATCH 3/3] Update Jenkinsfile

Move the "options" directive after the "agent" section (to match other code examples throughout the Jenkins User Documentation).
---
 jenkins/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 802c0e0..0d2efda 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -1,13 +1,13 @@
 pipeline {
-    options {
-        skipStagesAfterUnstable()
-    }
     agent {
         docker {
             image 'maven:3-alpine'
             args '-v /root/.m2:/root/.m2'
         }
     }
+    options {
+        skipStagesAfterUnstable()
+    }
     stages {
         stage('Build') {
             steps {