Selaa lähdekoodia

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 5 vuotta sitten
vanhempi
commit
c5bfb0290e
1 muutettua tiedostoa jossa 5 lisäystä ja 5 poistoa
  1. 5 5
      Jenkinsfile

+ 5 - 5
Jenkinsfile

@@ -328,7 +328,7 @@ pipeline {
                                 bundleName=janky
                                 bundleName=janky
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 # exclude overlay2 directories
                                 # exclude overlay2 directories
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
                                 '''
                                 '''
 
 
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -425,7 +425,7 @@ pipeline {
                                 bundleName=s390x-integration
                                 bundleName=s390x-integration
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 # exclude overlay2 directories
                                 # exclude overlay2 directories
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
                                 '''
                                 '''
 
 
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -503,7 +503,7 @@ pipeline {
                                 bundleName=s390x-integration-cli
                                 bundleName=s390x-integration-cli
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 # exclude overlay2 directories
                                 # exclude overlay2 directories
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
                                 '''
                                 '''
 
 
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -598,7 +598,7 @@ pipeline {
                                 bundleName=powerpc-integration
                                 bundleName=powerpc-integration
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 # exclude overlay2 directories
                                 # exclude overlay2 directories
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
                                 '''
                                 '''
 
 
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
@@ -674,7 +674,7 @@ pipeline {
                                 bundleName=powerpc-integration-cli
                                 bundleName=powerpc-integration-cli
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 echo "Creating ${bundleName}-bundles.tar.gz"
                                 # exclude overlay2 directories
                                 # exclude overlay2 directories
-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -o -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
                                 '''
                                 '''
 
 
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true
                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true