From 8b65e058bedba80cd50eae0c211c71976b7be88f Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sun, 11 Aug 2019 22:12:39 +0200
Subject: [PATCH] Jenkinsfile: use wildcards for artifacts, and don't fail on
 missing ones

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Jenkinsfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 95b1a240ef..d15c0cd165 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -114,7 +114,7 @@ pipeline {
                                     tar -czf docker-py-bundles.tar.gz bundles/test-docker-py/*.xml bundles/test-docker-py/*.log
                                     '''
 
-                                    archiveArtifacts artifacts: 'docker-py-bundles.tar.gz'
+                                    archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                                 }
                             }
                         }
@@ -205,7 +205,7 @@ pipeline {
                             tar -czvf unit-bundles.tar.gz bundles/junit-report.xml bundles/go-test-report.json bundles/profile.out
                             '''
 
-                            archiveArtifacts artifacts: 'unit-bundles.tar.gz'
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                         }
                         cleanup {
                             sh 'make clean'
@@ -323,7 +323,7 @@ pipeline {
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf janky-bundles.tar.gz
                             '''
 
-                            archiveArtifacts artifacts: 'janky-bundles.tar.gz'
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                         }
                         cleanup {
                             sh 'make clean'
@@ -417,7 +417,7 @@ pipeline {
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-bundles.tar.gz
                             '''
 
-                            archiveArtifacts artifacts: 's390x-integration-bundles.tar.gz'
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                         }
                         cleanup {
                             sh 'make clean'
@@ -491,7 +491,7 @@ pipeline {
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-cli-bundles.tar.gz
                             '''
 
-                            archiveArtifacts artifacts: 's390x-integration-cli-bundles.tar.gz'
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                         }
                         cleanup {
                             sh 'make clean'
@@ -583,7 +583,7 @@ pipeline {
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-bundles.tar.gz
                             '''
 
-                            archiveArtifacts artifacts: 'powerpc-integration-bundles.tar.gz'
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                         }
                         cleanup {
                             sh 'make clean'
@@ -655,7 +655,7 @@ pipeline {
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-cli-bundles.tar.gz
                             '''
 
-                            archiveArtifacts artifacts: 'powerpc-integration-cli-bundles.tar.gz'
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                         }
                         cleanup {
                             sh 'make clean'