X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch;h=0000000000000000000000000000000000000000;hb=e0634c6eaf2fe2641a0fb90e84a5defb880b1335;hp=9169f66ccd8c397002a112fc83870bfa955c7327;hpb=210d0f78485e760dffcdd3f630f59cec797f3f11;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/stx-puppet/0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch b/meta-stx/recipes-support/puppet/files/stx-puppet/0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch
deleted file mode 100644
index 9169f66..0000000
--- a/meta-stx/recipes-support/puppet/files/stx-puppet/0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f027236dd57ca3ba20b6f827026a639c6fb373d8 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Fri, 20 Mar 2020 13:16:35 +0800
-Subject: [PATCH] puppet-manifest-apply: do not treat warnings as blocker issue
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/bin/puppet-manifest-apply.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/puppet-manifests/src/bin/puppet-manifest-apply.sh b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-index 4d36059..18eec2c 100755
---- a/puppet-manifests/src/bin/puppet-manifest-apply.sh
-+++ b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-@@ -105,10 +105,10 @@ if [ $? -ne 0 ]; then
-     echo "See ${LOGFILE} for details"
-     exit 1
- else
--    grep -qE '^(.......)?Warning|^....-..-..T..:..:..([.]...)?(.......)?.Warning|^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
-+    grep -qE '^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
-     if [ $? -eq 0 ]; then
--        echo "[WARNING]"
--        echo "Warnings found. See ${LOGFILE} for details"
-+        echo "[ERROR]"
-+        echo "Errors found. See ${LOGFILE} for details"
-         exit 1
-     fi
-     echo "[DONE]"
--- 
-2.7.4
-