Browse code

Jenkinsfile: fix invalid expression in bundles script

This was introduced in a76ff632a4a833851ef36726c9e9bfb5e7dbed39:

+ find bundles -path */root/*overlay2 -prune -o -type f ( -o -name *.log -o -name *.prof ) -print
find: invalid expression; you have used a binary operator '-o' with nothing before it.

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

Sebastiaan van Stijn authored on 2019/08/28 09:14:29
Showing 1 changed files
... ...
@@ -328,7 +328,7 @@ pipeline {
328 328
                                 bundleName=janky
329 329
                                 echo "Creating ${bundleName}-bundles.tar.gz"
330 330
                                 # exclude overlay2 directories
331
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
331
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
332 332
                                 '''
333 333
 
334 334
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
... ...
@@ -425,7 +425,7 @@ pipeline {
425 425
                                 bundleName=s390x-integration
426 426
                                 echo "Creating ${bundleName}-bundles.tar.gz"
427 427
                                 # exclude overlay2 directories
428
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
428
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
429 429
                                 '''
430 430
 
431 431
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
... ...
@@ -503,7 +503,7 @@ pipeline {
503 503
                                 bundleName=s390x-integration-cli
504 504
                                 echo "Creating ${bundleName}-bundles.tar.gz"
505 505
                                 # exclude overlay2 directories
506
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
506
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
507 507
                                 '''
508 508
 
509 509
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
... ...
@@ -598,7 +598,7 @@ pipeline {
598 598
                                 bundleName=powerpc-integration
599 599
                                 echo "Creating ${bundleName}-bundles.tar.gz"
600 600
                                 # exclude overlay2 directories
601
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
601
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
602 602
                                 '''
603 603
 
604 604
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
... ...
@@ -674,7 +674,7 @@ pipeline {
674 674
                                 bundleName=powerpc-integration-cli
675 675
                                 echo "Creating ${bundleName}-bundles.tar.gz"
676 676
                                 # exclude overlay2 directories
677
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
677
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
678 678
                                 '''
679 679
 
680 680
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true