meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch

   1 From f027236dd57ca3ba20b6f827026a639c6fb373d8 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Fri, 20 Mar 2020 13:16:35 +0800
   4 Subject: [PATCH] puppet-manifest-apply: do not treat warnings as blocker issue
   5
   6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
   7 ---
   8  puppet-manifests/src/bin/puppet-manifest-apply.sh | 6 +++---
   9  1 file changed, 3 insertions(+), 3 deletions(-)
  10
  11 diff --git a/puppet-manifests/src/bin/puppet-manifest-apply.sh b/puppet-manifests/src/bin/puppet-manifest-apply.sh
  12 index 4d36059..18eec2c 100755
  13 --- a/puppet-manifests/src/bin/puppet-manifest-apply.sh
  14 +++ b/puppet-manifests/src/bin/puppet-manifest-apply.sh
  15 @@ -105,10 +105,10 @@ if [ $? -ne 0 ]; then
  16      echo "See ${LOGFILE} for details"
  17      exit 1
  18  else
  19 -    grep -qE '^(.......)?Warning|^....-..-..T..:..:..([.]...)?(.......)?.Warning|^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
  20 +    grep -qE '^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
  21      if [ $? -eq 0 ]; then
  22 -        echo "[WARNING]"
  23 -        echo "Warnings found. See ${LOGFILE} for details"
  24 +        echo "[ERROR]"
  25 +        echo "Errors found. See ${LOGFILE} for details"
  26          exit 1
  27      fi
  28      echo "[DONE]"
  29 --
  30 2.7.4
  31