From e8e9f78667ca86f21896e2fe5ea0904202bf2336 Mon Sep 17 00:00:00 2001 From: Tomáš Levora Date: Thu, 30 May 2019 09:31:24 +0200 Subject: Remove tag parameter from docker-image-collector.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing tag parameter from docker-image-collector.sh as it's not necessary as described in OOM-1881 Issue-ID: OOM-1885 Change-Id: Id83b396c4b994cfa659c518e3f03e704a84d65f0 Signed-off-by: Tomáš Levora --- build/creating_data/docker-images-collector.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/creating_data/docker-images-collector.sh b/build/creating_data/docker-images-collector.sh index e13b9150..7e468c44 100755 --- a/build/creating_data/docker-images-collector.sh +++ b/build/creating_data/docker-images-collector.sh @@ -30,9 +30,9 @@ usage () { echo " " echo " This script is preparing docker images list based on kubernetes project" echo " Usage:" - echo " ./$(basename $0) []" + echo " ./$(basename $0) []" echo " " - echo " Example: ./$(basename $0) onap_3.0.2 /root/oom/kubernetes/onap" + echo " Example: ./$(basename $0) /root/oom/kubernetes/onap" echo " " echo " Dependencies: helm, python-yaml, make" echo " " @@ -61,20 +61,22 @@ create_list() { } # Configuration -TAG="${1}" -PROJECT_DIR="${2}" -LIST="${3}" +if [ "${1}" == "-h" ] || [ "${1}" == "--help" ] || [ $# -lt 1 ]; then + usage +fi + +PROJECT_DIR="${1}" +LIST="${2}" LISTS_DIR="$(readlink -f $(dirname ${0}))/../data_lists" HELM_REPO="local http://127.0.0.1:8879" +PROJECT="$(basename ${1})" -if [ "${1}" == "-h" ] || [ "${1}" == "--help" ] || [ $# -lt 2 ]; then - usage -elif [ ! -f "${PROJECT_DIR}/../Makefile" ]; then +if [ ! -f "${PROJECT_DIR}/../Makefile" ]; then echo "Wrong path to project directory entered" exit 1 elif [ -z "${LIST}" ]; then mkdir -p ${LISTS_DIR} - LIST="${LISTS_DIR}/${TAG}-docker_images.list" + LIST="${LISTS_DIR}/${PROJECT}_docker_images.list" fi if [ -e "${LIST}" ]; then @@ -82,8 +84,6 @@ if [ -e "${LIST}" ]; then MSG="$(realpath ${LIST}) already existed\nCreated backup $(realpath ${LIST}).bk\n" fi -PROJECT="$(basename ${2})" - # Setup helm if pgrep -x "helm" > /dev/null; then echo "helm is already running" -- cgit 1.2.3-korg From 12836bfcb03693cdc34f960a68276a7e6b39478b Mon Sep 17 00:00:00 2001 From: Tomáš Levora Date: Thu, 30 May 2019 17:11:28 +0200 Subject: Add comment to automatically generated docker list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add comment to docker image list generated by docker-images-collector.sh to reffer to commit id in case of ONAP or to project in other cases Issue-ID: OOM-1884 Change-Id: I7ff32fae84db3476495eb2e560c3bf61e41e2ddb Signed-off-by: Tomáš Levora --- build/creating_data/docker-images-collector.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/creating_data/docker-images-collector.sh b/build/creating_data/docker-images-collector.sh index 7e468c44..e2b56fa7 100755 --- a/build/creating_data/docker-images-collector.sh +++ b/build/creating_data/docker-images-collector.sh @@ -106,12 +106,17 @@ popd # Create the list from all enabled subsystems 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 create_list ${subsystem} - done + done | sort -u > ${LIST} else - create_list ${PROJECT} -fi | sort -u > ${LIST} + COMMENT="${PROJECT}" + create_list ${PROJECT} | sort -u > ${LIST} +fi + +# Add comment reffering to the project +sed -i "1i# generated from ${COMMENT}" "${LIST}" echo -e ${MSG} echo -e 'The list has been created:\n '"${LIST}" -- cgit 1.2.3-korg From 0830f7a474492a2ebba17cfde3dd7958c1fb3f94 Mon Sep 17 00:00:00 2001 From: Tomáš Levora Date: Fri, 31 May 2019 14:10:15 +0200 Subject: Fixing bug in docker-images-collector.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- build/creating_data/docker-images-collector.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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' } -- cgit 1.2.3-korg