summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2019-11-28 08:10:18 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-28 08:10:18 +0000
commit610ddff2d54cece28af56cc7bbf01ed524ecce9c (patch)
tree83340a4d1e04d4e05cd6b77d7f1abba33abe92e3 /build
parent3c6f676f8f50ac796804900c0ba1e3d9ffc1ff29 (diff)
parent62b73a685cd6dfdf24773d331524a274d7b1bfa4 (diff)
Merge "docker-images-collector.sh to use override values.yaml"
Diffstat (limited to 'build')
-rwxr-xr-xbuild/creating_data/docker-images-collector.sh4
1 files changed, 2 insertions, 2 deletions
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