Code Review
/
ric-plt
/
ric-dep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update a1 mediator image and helm installation
[ric-plt/ric-dep.git]
/
bin
/
verify-ric-charts
diff --git
a/bin/verify-ric-charts
b/bin/verify-ric-charts
index
7400185
..
fdeda1b
100755
(executable)
--- a/
bin/verify-ric-charts
+++ b/
bin/verify-ric-charts
@@
-28,7
+28,7
@@
echo "--> verify-ric-charts"
if [[ "${1:-nope}" != "nope" ]]; then
HELMVERSION=$1
else
if [[ "${1:-nope}" != "nope" ]]; then
HELMVERSION=$1
else
- HELMVERSION=2.1
2.3
+ HELMVERSION=2.1
7.0
fi
if [[ "${2:-nope}" != "nope" ]]; then
OVERRIDEYAML=$2
fi
if [[ "${2:-nope}" != "nope" ]]; then
OVERRIDEYAML=$2
@@
-40,7
+40,7
@@
HELM_COMMAND=helm
if ! $($HELM_COMMAND > /dev/null);then
echo "Download and install Helm"
if [ ! -e helm-v${HELMVERSION}-linux-amd64.tar.gz ]; then
if ! $($HELM_COMMAND > /dev/null);then
echo "Download and install Helm"
if [ ! -e helm-v${HELMVERSION}-linux-amd64.tar.gz ]; then
- wget -nv https://
storage.googleapis.com/kubernetes-helm
/helm-v${HELMVERSION}-linux-amd64.tar.gz
+ wget -nv https://
get.helm.sh
/helm-v${HELMVERSION}-linux-amd64.tar.gz
fi
tar -xvf ./helm-v${HELMVERSION}-linux-amd64.tar.gz
mv linux-amd64/helm ./
fi
tar -xvf ./helm-v${HELMVERSION}-linux-amd64.tar.gz
mv linux-amd64/helm ./
@@
-67,6
+67,7
@@
$HELM_COMMAND package --save=false -d ./charts "$ROOT_DIR/dep/ric-common/Common-
$HELM_COMMAND repo index ./charts
# Make sure that helm local repo is added
$HELM_COMMAND repo remove local
$HELM_COMMAND repo index ./charts
# Make sure that helm local repo is added
$HELM_COMMAND repo remove local
+$HELM_COMMAND repo remove stable
$HELM_COMMAND repo add local http://127.0.0.1:8879/charts
# Remove it/dep charts
rm -rf ./dep
$HELM_COMMAND repo add local http://127.0.0.1:8879/charts
# Remove it/dep charts
rm -rf ./dep
@@
-87,24
+88,18
@@
do
# Lint clearly marks errors; e.g., [ERROR]
echo "Performing Helm lint"
if [[ "${OVERRIDEYAML:-nope}" != "nope" ]]; then
# 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
else
- $HELM_COMMAND lint "$dir"
> /tmp/output 2>&1
+ $HELM_COMMAND lint "$dir"
fi
echo "***************************************************************************************************************"
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
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
else
- $HELM_COMMAND template "$dir"
> /tmp/output 2>&1
+ $HELM_COMMAND template "$dir"
fi
echo "***************************************************************************************************************"
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
done
echo "--> verify-ric-charts ends"
exit 0