From 72b18309743df85e94ba12053ee9bf7e4b27382f Mon Sep 17 00:00:00 2001
From: William Giokas <1007380@gmail.com>
Date: Thu, 12 Jul 2018 10:17:03 -0600
Subject: [PATCH] Set up junit in jenkins

Moved the archive to the always statement. Doesn't change the junit
stuff, but now we at least save the XML when we fail.
---
 .ci/kitchen-centos7-py2    | 3 ++-
 .ci/kitchen-centos7-py3    | 3 ++-
 .ci/kitchen-ubuntu1604-py2 | 3 ++-
 .ci/kitchen-ubuntu1604-py3 | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
index ee47ea6c61..65f442e1be 100644
--- a/.ci/kitchen-centos7-py2
+++ b/.ci/kitchen-centos7-py2
@@ -31,7 +31,6 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
@@ -41,12 +40,14 @@ pipeline {
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
         always {
+            junit 'artifacts/xml-unittests-output/*.xml'
             cleanWs()
         }
         success {
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
index 999aebeeb3..731e69c42d 100644
--- a/.ci/kitchen-centos7-py3
+++ b/.ci/kitchen-centos7-py3
@@ -31,7 +31,6 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
@@ -41,12 +40,14 @@ pipeline {
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
         always {
+            junit 'artifacts/xml-unittests-output/*.xml'
             cleanWs()
         }
         success {
diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2
index 20ff7d9463..61e510b72f 100644
--- a/.ci/kitchen-ubuntu1604-py2
+++ b/.ci/kitchen-ubuntu1604-py2
@@ -31,7 +31,6 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
@@ -41,12 +40,14 @@ pipeline {
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
         always {
+            junit 'artifacts/xml-unittests-output/*.xml'
             cleanWs()
         }
         success {
diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3
index 91712b717d..205a934573 100644
--- a/.ci/kitchen-ubuntu1604-py3
+++ b/.ci/kitchen-ubuntu1604-py3
@@ -31,7 +31,6 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
@@ -41,12 +40,14 @@ pipeline {
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
         always {
+            junit 'artifacts/xml-unittests-output/*.xml'
             cleanWs()
         }
         success {