diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-02-04 12:52:20 +0200 |
|---|---|---|
| committer | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-02-12 09:35:15 +0200 |
| commit | 6e5b45ab81ee9bfba2a396b65ffdd999abffc4e4 (patch) | |
| tree | 20d05f12c2e76c8d7fdf62e18bf47efaaeb30bf6 /build/package.sh | |
| parent | 5f5aa01c0f757ff3a9eb55eb978b98e45f23a079 (diff) | |
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>
Diffstat (limited to 'build/package.sh')
| -rwxr-xr-x | build/package.sh | 11 |
1 files changed, 7 insertions, 4 deletions
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 |