pipeline(precompile): fix blobstore errors detection

wrong formatted shell command
orange-cloudfoundry · Aug 21, 2023 · c18a835 · c18a835
1 parent 12ab70e
commit c18a835
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/concourse/pipelines/template/bosh-precompile-pipeline.yml.erb b/concourse/pipelines/template/bosh-precompile-pipeline.yml.erb
@@ -539,7 +539,7 @@ jobs:
                 echo "Exporting ${RELEASE_NAME}/${RELEASE_VERSION} - ${STEMCELL_OS}/${STEMCELL_VERSION}"
                 TIMESTAMP=$(date +'%Y-%m-%d-%H-%M-%S')
                 if ! bosh export-release "${RELEASE_NAME}/${RELEASE_VERSION}" "${STEMCELL_OS}/${STEMCELL_VERSION}" --dir=exported-release --tty|tee exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log;then
-                  BLOBSTORE_ERROR_COUNT=$(grep -i error|grep -i "blobstore" exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log |wc -l)
+                  BLOBSTORE_ERROR_COUNT=$(grep -i error exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log|grep -i "blobstore"|wc -l)
                   if [ $BLOBSTORE_ERROR_COUNT -gt 0 ];then
                     echo "COA - Blobstore error detected, cleaning deployment and release"
                     bosh delete-deployment --non-interactive

diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml
@@ -349,7 +349,7 @@ jobs:
                 echo "Exporting ${RELEASE_NAME}/${RELEASE_VERSION} - ${STEMCELL_OS}/${STEMCELL_VERSION}"
                 TIMESTAMP=$(date +'%Y-%m-%d-%H-%M-%S')
                 if ! bosh export-release "${RELEASE_NAME}/${RELEASE_VERSION}" "${STEMCELL_OS}/${STEMCELL_VERSION}" --dir=exported-release --tty|tee exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log;then
-                  BLOBSTORE_ERROR_COUNT=$(grep -i error|grep -i "blobstore" exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log |wc -l)
+                  BLOBSTORE_ERROR_COUNT=$(grep -i error exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log|grep -i "blobstore"|wc -l)
                   if [ $BLOBSTORE_ERROR_COUNT -gt 0 ];then
                     echo "COA - Blobstore error detected, cleaning deployment and release"
                     bosh delete-deployment --non-interactive
@@ -479,7 +479,7 @@ jobs:
                 echo "Exporting ${RELEASE_NAME}/${RELEASE_VERSION} - ${STEMCELL_OS}/${STEMCELL_VERSION}"
                 TIMESTAMP=$(date +'%Y-%m-%d-%H-%M-%S')
                 if ! bosh export-release "${RELEASE_NAME}/${RELEASE_VERSION}" "${STEMCELL_OS}/${STEMCELL_VERSION}" --dir=exported-release --tty|tee exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log;then
-                  BLOBSTORE_ERROR_COUNT=$(grep -i error|grep -i "blobstore" exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log |wc -l)
+                  BLOBSTORE_ERROR_COUNT=$(grep -i error exported-release/${RELEASE_NAME}-${RELEASE_VERSION}-${TIMESTAMP}.log|grep -i "blobstore"|wc -l)
                   if [ $BLOBSTORE_ERROR_COUNT -gt 0 ];then
                     echo "COA - Blobstore error detected, cleaning deployment and release"
                     bosh delete-deployment --non-interactive