From 2a9da683b5770657737f16535320fd66cac5ba9e Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Tue, 7 Apr 2020 17:33:19 -0400 Subject: [PATCH] make verify script more verbose Issue-ID: INT-109 Signed-off-by: Zhe Huang Change-Id: Ic82f802423a1b1bc112ceb06a8897c6d07220826 --- bin/verify-ric-charts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts index 7400185..2a8b9e6 100755 --- a/bin/verify-ric-charts +++ b/bin/verify-ric-charts @@ -87,24 +87,18 @@ do # Lint clearly marks errors; e.g., [ERROR] echo "Performing Helm lint" if [[ "${OVERRIDEYAML:-nope}" != "nope" ]]; then - $HELM_COMMAND lint -f "$OVERRIDEYAML" "$dir"> /tmp/output 2>&1 + $HELM_COMMAND lint -f "$OVERRIDEYAML" "$dir" else - $HELM_COMMAND lint "$dir" > /tmp/output 2>&1 + $HELM_COMMAND lint "$dir" fi echo "***************************************************************************************************************" - cat /tmp/output - egrep -q '^Error: [0-9]* chart\(s\) linted, [0-9]* chart\(s\) failed' /tmp/output && exit 1 - echo "***************************************************************************************************************" echo "Rendering Helm charts locally" if [[ "${OVERRIDEYAML:-nope}" != "nope" ]]; then - $HELM_COMMAND template -f "$OVERRIDEYAML" "$dir" > /tmp/output 2>&1 + $HELM_COMMAND template -f "$OVERRIDEYAML" "$dir" else - $HELM_COMMAND template "$dir" > /tmp/output 2>&1 + $HELM_COMMAND template "$dir" fi echo "***************************************************************************************************************" - cat /tmp/output - grep -E -n '%!.\(.*=.*\)' /tmp/output && echo "Error: Type mismatch." && exit 1 - echo "***************************************************************************************************************" done echo "--> verify-ric-charts ends" exit 0 -- 2.16.6