1. docker
  2. Commit e6b49956d8654e26e6fa6dd3172484b73a6f0ba8
Browse code

fix bundles filenames in Jenkinsfile

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit eb30f0ad8448d27cf9303744596ee0310457f0b9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Andrew Hsu authored on 2019/08/13 05:48:42
Showing 1 changed files
Jenkinsfile
History View file @ e6b4995
... ... 
@@ -366,9 +366,9 @@ pipeline {
366 366 
                             '''
367 367
368 368 
                             sh '''
369 
-                            echo "Creating s390x-bundles.tar.gz"
369 
+                            echo "Creating s390x-integration-bundles.tar.gz"
370 370 
                             # exclude overlay2 directories
371 
-                            find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-bundles.tar.gz
371 
+                            find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-bundles.tar.gz
372 372 
                             '''
373 373
374 374 
                             archiveArtifacts artifacts: 's390x-integration-bundles.tar.gz'
... ... 
@@ -441,11 +441,11 @@ pipeline {
441 441 
                             '''
442 442
443 443 
                             sh '''
444 
-                            echo "Creating bundles.tar.gz"
445 
-                            find bundles -name '*.log' | xargs tar -czf z-integration-cli-bundles.tar.gz
444 
+                            echo "Creating s390x-integration-cli-bundles.tar.gz"
445 
+                            find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf s390x-integration-cli-bundles.tar.gz
446 446 
                             '''
447 447
448 
-                            archiveArtifacts artifacts: 'z-integration-cli-bundles.tar.gz'
448 
+                            archiveArtifacts artifacts: 's390x-integration-cli-bundles.tar.gz'
449 449 
                         }
450 450 
                         cleanup {
451 451 
                             sh 'make clean'
... ... 
@@ -600,8 +600,8 @@ pipeline {
600 600 
                             '''
601 601
602 602 
                             sh '''
603 
-                            echo "Creating bundles.tar.gz"
604 
-                            find bundles -name '*.log' | xargs tar -czf powerpc-integration-cli-bundles.tar.gz
603 
+                            echo "Creating powerpc-integration-cli-bundles.tar.gz"
604 
+                            find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf powerpc-integration-cli-bundles.tar.gz
605 605 
                             '''
606 606
607 607 
                             archiveArtifacts artifacts: 'powerpc-integration-cli-bundles.tar.gz'