From: Zhe Huang <zhehuang@research.att.com>
Date: Thu, 23 Apr 2020 19:53:50 +0000 (-0400)
Subject: update how common-templates are prepared
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2d35381686060a0e63d2921b97883a1f97761517;p=ric-plt%2Fric-dep.git

update how common-templates are prepared

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I26d4f76fdb0bb02b573ae4f946fb1cf9bccd88a9
---

diff --git a/bin/setup-ric-common-template b/bin/setup-ric-common-template
index 73fd422..03c2195 100755
--- a/bin/setup-ric-common-template
+++ b/bin/setup-ric-common-template
@@ -24,31 +24,8 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 #git clone "https://gerrit.o-ran-sc.org/r/it/dep" ../dep
 git clone --single-branch "https://gerrit.o-ran-sc.org/r/it/dep" ../dep
 
-# Start Helm local repo if there isn't one
-HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
-if [ -z "$HELM_REPO_PID" ]; then
-    nohup helm serve >& /dev/null &
-fi
-
-# Package ric-common and serve it using Helm local repo
-HELM_HOME=$(helm home)
-COMMON_CHART_VERSION=$(cat $ROOT_DIR/../dep/ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $ROOT_DIR/../dep/ric-common/Common-Template/helm/ric-common
-cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
-
-AUX_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../dep/ric-common/Common-Template/helm/aux-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $ROOT_DIR/../dep/ric-common/Common-Template/helm/aux-common
-cp /tmp/aux-common-$AUX_COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
-
-
-
-helm repo index $HELM_HOME/repository/local/
-
-
-# Make sure that helm local repo is added
-helm repo remove local
-helm repo add local http://127.0.0.1:8879/charts
 
+$ROOT_DIR/../dep/bin/prepare-common-templates
 
 # Remove it/dep charts
-rm -rf ../dep
+rm -rf $ROOT_DIR/../dep