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

Commit 591e431

Browse files
committed
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> Upstream-commit: c5bfb0290e3e35d646c3838debe76a9585177264 Component: engine
1 parent 78ec459 commit 591e431

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

components/engine/Jenkinsfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ pipeline {
328328
bundleName=janky
329329
echo "Creating ${bundleName}-bundles.tar.gz"
330330
# 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
332332
'''
333333

334334
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -425,7 +425,7 @@ pipeline {
425425
bundleName=s390x-integration
426426
echo "Creating ${bundleName}-bundles.tar.gz"
427427
# 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
429429
'''
430430

431431
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -503,7 +503,7 @@ pipeline {
503503
bundleName=s390x-integration-cli
504504
echo "Creating ${bundleName}-bundles.tar.gz"
505505
# 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
507507
'''
508508

509509
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -598,7 +598,7 @@ pipeline {
598598
bundleName=powerpc-integration
599599
echo "Creating ${bundleName}-bundles.tar.gz"
600600
# 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
602602
'''
603603

604604
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -674,7 +674,7 @@ pipeline {
674674
bundleName=powerpc-integration-cli
675675
echo "Creating ${bundleName}-bundles.tar.gz"
676676
# 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
678678
'''
679679

680680
archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true

0 commit comments

Comments
 (0)