From: Samuli Silvius <s.silvius@partner.samsung.com>
Date: Mon, 25 Nov 2019 06:45:12 +0000 (+0200)
Subject: docker-images-collector.sh to use override values.yaml
X-Git-Tag: 6.0.0-ONAP~63^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F98795%2F3;p=oom%2Foffline-installer.git

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
---

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
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index 01f248ff..12426b7c 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -97,13 +97,12 @@ Part 2. Download artifacts for offline installer
     # clone the OOM repository
     git clone https://gerrit.onap.org/r/oom -b master --recurse-submodules /tmp/oom
 
-    # enable subsystems in oom/kubernetes/onap/values.yaml as required
+    # docker-images-collector.sh script uses oom/kubernetes/onap/resources/overrides/onap-all.yaml file to find what subsystems
+    are enabled. By default all subsystems are enabled there. Modify the file if want to drop some subsystems.
 
     #run the collector providing path the the project
     ./build/creating_data/docker-images-collector.sh /tmp/oom/kubernetes/onap
 
-   If the list does not contain any image, no subsystem is enabled in the oom/kubernetes/onap/values.yaml
-
    For the other options check the usage of the script.
 
 .. note:: Skip this step if you have already all necessary resources and continue with Part 3. Populate local nexus