Browse code

Jenkinsfile: use wildcards for artifacts, and don't fail on missing ones

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8b65e058bedba80cd50eae0c211c71976b7be88f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/08/12 05:12:39
Showing 1 changed files
... ...
@@ -114,7 +114,7 @@ pipeline {
114 114
                                     tar -czf docker-py-bundles.tar.gz bundles/test-docker-py/*.xml bundles/test-docker-py/*.log
115 115
                                     '''
116 116
 
117
-                                    archiveArtifacts artifacts: 'docker-py-bundles.tar.gz'
117
+                                    archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
118 118
                                 }
119 119
                             }
120 120
                         }
... ...
@@ -205,7 +205,7 @@ pipeline {
205 205
                             tar -czvf unit-bundles.tar.gz bundles/junit-report.xml bundles/go-test-report.json bundles/profile.out
206 206
                             '''
207 207
 
208
-                            archiveArtifacts artifacts: 'unit-bundles.tar.gz'
208
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
209 209
                         }
210 210
                         cleanup {
211 211
                             sh 'make clean'
... ...
@@ -323,7 +323,7 @@ pipeline {
323 323
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf janky-bundles.tar.gz
324 324
                             '''
325 325
 
326
-                            archiveArtifacts artifacts: 'janky-bundles.tar.gz'
326
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
327 327
                         }
328 328
                         cleanup {
329 329
                             sh 'make clean'
... ...
@@ -417,7 +417,7 @@ pipeline {
417 417
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-bundles.tar.gz
418 418
                             '''
419 419
 
420
-                            archiveArtifacts artifacts: 's390x-integration-bundles.tar.gz'
420
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
421 421
                         }
422 422
                         cleanup {
423 423
                             sh 'make clean'
... ...
@@ -491,7 +491,7 @@ pipeline {
491 491
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-cli-bundles.tar.gz
492 492
                             '''
493 493
 
494
-                            archiveArtifacts artifacts: 's390x-integration-cli-bundles.tar.gz'
494
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
495 495
                         }
496 496
                         cleanup {
497 497
                             sh 'make clean'
... ...
@@ -583,7 +583,7 @@ pipeline {
583 583
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-bundles.tar.gz
584 584
                             '''
585 585
 
586
-                            archiveArtifacts artifacts: 'powerpc-integration-bundles.tar.gz'
586
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
587 587
                         }
588 588
                         cleanup {
589 589
                             sh 'make clean'
... ...
@@ -655,7 +655,7 @@ pipeline {
655 655
                             find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-cli-bundles.tar.gz
656 656
                             '''
657 657
 
658
-                            archiveArtifacts artifacts: 'powerpc-integration-cli-bundles.tar.gz'
658
+                            archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
659 659
                         }
660 660
                         cleanup {
661 661
                             sh 'make clean'