Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit b6119bc

Browse files
committed
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> Upstream-commit: 22f6cfd4df9b333a0e165d948d02e827b3b2ceb8 Component: engine
1 parent f23f890 commit b6119bc

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

components/engine/Jenkinsfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pipeline {
114114
tar -czf docker-py-bundles.tar.gz bundles/test-docker-py/*.xml bundles/test-docker-py/*.log
115115
'''
116116

117-
archiveArtifacts artifacts: 'docker-py-bundles.tar.gz'
117+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
118118
}
119119
}
120120
}
@@ -205,7 +205,7 @@ pipeline {
205205
tar -czvf unit-bundles.tar.gz bundles/junit-report.xml bundles/go-test-report.json bundles/profile.out
206206
'''
207207

208-
archiveArtifacts artifacts: 'unit-bundles.tar.gz'
208+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
209209
}
210210
cleanup {
211211
sh 'make clean'
@@ -323,7 +323,7 @@ pipeline {
323323
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf janky-bundles.tar.gz
324324
'''
325325

326-
archiveArtifacts artifacts: 'janky-bundles.tar.gz'
326+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
327327
}
328328
cleanup {
329329
sh 'make clean'
@@ -417,7 +417,7 @@ pipeline {
417417
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-bundles.tar.gz
418418
'''
419419

420-
archiveArtifacts artifacts: 's390x-integration-bundles.tar.gz'
420+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
421421
}
422422
cleanup {
423423
sh 'make clean'
@@ -491,7 +491,7 @@ pipeline {
491491
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-cli-bundles.tar.gz
492492
'''
493493

494-
archiveArtifacts artifacts: 's390x-integration-cli-bundles.tar.gz'
494+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
495495
}
496496
cleanup {
497497
sh 'make clean'
@@ -583,7 +583,7 @@ pipeline {
583583
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-bundles.tar.gz
584584
'''
585585

586-
archiveArtifacts artifacts: 'powerpc-integration-bundles.tar.gz'
586+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
587587
}
588588
cleanup {
589589
sh 'make clean'
@@ -655,7 +655,7 @@ pipeline {
655655
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-cli-bundles.tar.gz
656656
'''
657657

658-
archiveArtifacts artifacts: 'powerpc-integration-cli-bundles.tar.gz'
658+
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
659659
}
660660
cleanup {
661661
sh 'make clean'

0 commit comments

Comments
 (0)