From 62b73a685cd6dfdf24773d331524a274d7b1bfa4 Mon Sep 17 00:00:00 2001
From: Samuli Silvius <s.silvius@partner.samsung.com>
Date: Mon, 25 Nov 2019 08:45:12 +0200
Subject: docker-images-collector.sh to use override values.yaml
Change docker-images-collector.sh script to use file
oom/kubernetes/onap/resources/overrides/onap-all.yaml as
input instead of oom/kubernetes/onap/values.yaml.
Also small enable script running in Windows git bash.
Issue-ID: OOM-2222
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: Idf7143ed9880ac510c103f4d3a4d5a45f375d71a
---
build/creating_data/docker-images-collector.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'build')
diff --git a/build/creating_data/docker-images-collector.sh b/build/creating_data/docker-images-collector.sh
index 9a5baea7..c07de107 100755
--- a/build/creating_data/docker-images-collector.sh
+++ b/build/creating_data/docker-images-collector.sh
@@ -92,7 +92,7 @@ if [ -e "${LIST}" ]; then
fi
# Setup helm
-if pgrep -x "helm" > /dev/null; then
+if ps -eaf | grep -v "grep" | grep "helm" > /dev/null; then
echo "helm is already running"
else
helm init -c > /dev/null
@@ -114,7 +114,7 @@ popd
echo "Creating the list..."
if [ "${PROJECT}" == "onap" ]; then
COMMENT="OOM commit $(git --git-dir="${PROJECT_DIR}/../../.git" rev-parse HEAD)"
- for subsystem in `parse_yaml "${PROJECT_DIR}/values.yaml"`; do
+ for subsystem in `parse_yaml "${PROJECT_DIR}/resources/overrides/onap-all.yaml"`; do
create_list ${subsystem}
done | sort -u > ${LIST}
else
--
cgit