From: Mateusz Pilat Date: Thu, 14 May 2020 12:43:53 +0000 (+0200) Subject: Fix: docker-images-collector.sh collect empty image name in output list. Adding... X-Git-Tag: 6.0.0-ONAP~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F107679%2F1;p=oom%2Foffline-installer.git Fix: docker-images-collector.sh collect empty image name in output list. Adding also masterPassword param for helm templating The root cause is that not all parameters are present in aaf chart. It is an issue not only for image params, however other cases are not impacting us. Issue-ID: OOM-2405 Signed-off-by: Mateusz Pilat Change-Id: I1ad1d33717488a82a2ce1eebe524ee41e1264d40 --- diff --git a/build/creating_data/docker-images-collector.sh b/build/creating_data/docker-images-collector.sh index 76ee9016..8789350c 100755 --- a/build/creating_data/docker-images-collector.sh +++ b/build/creating_data/docker-images-collector.sh @@ -60,7 +60,7 @@ create_list() { else >&2 echo -e \n" !!! ${1} sybsystem does not exist !!!"\n fi - helm template "${SUBSYS_DIR}" | grep 'image:\ \|tag_version:\ \|h._image' | + helm template --set global.masterPassword=TemplatePassword -f ${PROJECT_DIR}/values.yaml "${SUBSYS_DIR}" | grep 'image:\ \|tag_version:\ \|h._image' | sed -e 's/^.*\"h._image\"\ :\ //; s/^.*\"\(.*\)\".*$/\1/' \ -e 's/\x27\|,//g; s/^.*\(image\|tag_version\):\ //' | tr -d '\r' }