diff options
| author |   Tomáš Levora <t.levora@partner.samsung.com> | 2019-05-31 14:10:15 +0200 |
|---|---|---|
| committer | Tomáš Levora <t.levora@partner.samsung.com> | 2019-05-31 14:13:28 +0200 |
| commit | 0830f7a474492a2ebba17cfde3dd7958c1fb3f94 (patch) | |
| tree | f507af4b4a9e1f149d9b21ae9e0b76432c5927e6 /build/creating_data | |
| parent | 12836bfcb03693cdc34f960a68276a7e6b39478b (diff) | |
Fixing bug in docker-images-collector.sh
Some images from oom/kubernetes/common/ were not correctly collected
by creating_data/docker-images-collector.sh script
Issue-ID: OOM-1886
Change-Id: I044ca8a26353da44cd6f8e94fcb822570c954b49
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
Diffstat (limited to 'build/creating_data')
| -rwxr-xr-x | build/creating_data/docker-images-collector.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/creating_data/docker-images-collector.sh b/build/creating_data/docker-images-collector.sh index e2b56fa7..9206b0bb 100755 --- a/build/creating_data/docker-images-collector.sh +++ b/build/creating_data/docker-images-collector.sh @@ -55,7 +55,14 @@ PYP } create_list() { - helm template "${PROJECT_DIR}/../${1}" | grep 'image:\ \|tag_version:\ \|h._image' | + if [ -d "${PROJECT_DIR}/../${1}" ]; then + SUBSYS_DIR="${PROJECT_DIR}/../${1}" + elif [ -d "${PROJECT_DIR}/../common/${1}" ]; then + SUBSYS_DIR="${PROJECT_DIR}/../common/${1}" + else + >&2 echo -e \n" !!! ${1} sybsystem does not exist !!!"\n + fi + helm template "${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' } |