From 6e5b45ab81ee9bfba2a396b65ffdd999abffc4e4 Mon Sep 17 00:00:00 2001
From: Samuli Silvius <s.silvius@partner.samsung.com>
Date: Mon, 4 Feb 2019 12:52:20 +0200
Subject: [PATCH] Helm charts dir commenting causes / dir copying

HELM_CHARTS_DIR in package.conf is unnecessarily mandatory.
When commenting out this variable, packaging script copies
machine's root directory content into package.

This commit will make HELM_CHARTS_DIR optional and its
existence is checked in package.sh script.

Issue-ID: OOM-1626

Change-Id: I7b5d135ab130a28491e7223b66f26b50ccce5fca
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
---
 build/package.conf |  3 +--
 build/package.sh   | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/package.conf b/build/package.conf
index 1141798b..c3bbeee9 100644
--- a/build/package.conf
+++ b/build/package.conf
@@ -16,8 +16,7 @@ SOFTWARE_PACKAGE_BASENAME="onap-offline"
 ########################
 
 # directory with helm charts
-HELM_CHARTS_DIR="/root/oom"
-
+#HELM_CHARTS_DIR=~/myclones/casablanca_oom/
 
 ###################
 # Packages addons #
diff --git a/build/package.sh b/build/package.sh
index 0e4f1213..fd9b9e75 100755
--- a/build/package.sh
+++ b/build/package.sh
@@ -105,10 +105,13 @@ function create_sw_package {
     done
 
     # Helm charts handling
-    echo "Helm charts handling"
-    # Copy charts available for ansible playbook to use/move them to target server/dir
-    mkdir -p "${pkg_root}"/ansible/application/helm_charts
-    cp -r "${HELM_CHARTS_DIR}"/* "${pkg_root}"/ansible/application/helm_charts
+    if [ ! -z "${HELM_CHARTS_DIR}" ];
+    then
+        echo "Helm charts handling"
+        # Copy charts available for ansible playbook to use/move them to target server/dir
+        mkdir -p "${pkg_root}"/ansible/application/helm_charts
+        cp -r "${HELM_CHARTS_DIR}"/* "${pkg_root}"/ansible/application/helm_charts
+    fi
 
     # Add metadata to the package
     add_metadata "${pkg_root}"/package.info
-- 
2.16.6