diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-11-25 08:45:12 +0200 |
|---|---|---|
| committer | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-11-25 16:30:51 +0200 |
| commit | 62b73a685cd6dfdf24773d331524a274d7b1bfa4 (patch) | |
| tree | 1f09941301dd07ea428ab4fda8eb41864266537a /build/creating_data/docker-images-collector.sh | |
| parent | cb93bcee2dc49826964f8400420fe6d375ed3662 (diff) | |
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
Diffstat (limited to 'build/creating_data/docker-images-collector.sh')
| -rwxr-xr-x | build/creating_data/docker-images-collector.sh | 4 |
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 |