commit 969e0d1339d744d21918a1baf24fb33b07a2ecda
author Luca Prete <luca@onlab.us> Thu Dec 13 11:55:19 2018 -0800
committer Luca Prete <luca@onlab.us> Thu Dec 13 12:18:09 2018 -0800
tree 987f0545fee6cc3c06924fc0fbf470c48d39e567
parent 34dd2361b3dd9e164a6634bd33afc266b78f77cf

Modify helmrepo to work with new directory structure

Change-Id: I33b708028d0c798102f03768748ad5131da4ff46

scripts/helmrepo.sh

diff --git a/scripts/helmrepo.sh b/scripts/helmrepo.sh
index 0405e55..1f35147 100755
--- a/scripts/helmrepo.sh
+++ b/scripts/helmrepo.sh
@@ -25,7 +25,7 @@
 REPO_DIR="${REPO_DIR:-chart_repo}"
 
 GERRIT_BRANCH="${GERRIT_BRANCH:-$(git symbolic-ref --short HEAD)}"
-PUBLISH_URL="${PUBLISH_URL:-https://charts.opencord.org/${GERRIT_BRANCH}}"
+PUBLISH_URL="${PUBLISH_URL:-https://charts.opencord.org}"
 
 mkdir -p "${REPO_DIR}"
 
@@ -41,7 +41,7 @@
 
 echo "Generating repo index"
 
-helm repo index "${REPO_DIR}" --url "${PUBLISH_URL}"
+helm repo index "${REPO_DIR}" --url "${PUBLISH_URL}" --merge
 
 echo "Finished, chart repo generated: ${REPO_DIR}"