Code Review
/
it
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Synch installs with it/dep and fix Dockerfile"
[it/test.git]
/
ric_robot_suite
/
helm
/
robot_install.sh
diff --git
a/ric_robot_suite/helm/robot_install.sh
b/ric_robot_suite/helm/robot_install.sh
index
92b7b93
..
867eb98
100755
(executable)
--- a/
ric_robot_suite/helm/robot_install.sh
+++ b/
ric_robot_suite/helm/robot_install.sh
@@
-1,6
+1,4
@@
-#!/bin/bash
-################################################################################
-# Copyright (c) 2019 AT&T Intellectual Property. #
+opyright (c) 2019 AT&T Intellectual Property. #
# Copyright (c) 2019 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# Copyright (c) 2019 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
@@
-29,7
+27,7
@@
BASE=${DIR%/test*}
# /data/ORAN-OSC/it/dep/ric-platform/50-RIC-Platform/bin/install
BASEDIR50=$BASE/dep/ric-platform/50-RIC-Platform/
# /data/ORAN-OSC/it/dep/ric-platform/50-RIC-Platform/bin/install
BASEDIR50=$BASE/dep/ric-platform/50-RIC-Platform/
-BASEDIR
_COMMON_TEMPLATE
=$BASE/dep/ric-common/Common-Template/helm/ric-common
+BASEDIR
COMMON
=$BASE/dep/ric-common/Common-Template/helm/ric-common
echo "Using etc/ric.conf from $BASEDIR50"
echo "Using etc/ric.conf from $BASEDIR50"
@@
-56,9
+54,12
@@
echo "Platform Namespace: $PLT_NAMESPACE"
echo "Helm Release Name: $RELEASE_NAME"
echo "Helm Release Name: $RELEASE_NAME"
-COMMON_CHART_VERSION=$(cat $BASEDIR_COMMON_TEMPLATE/Chart.yaml | grep version | awk '{print $2}')
+#COMMON_CHART_VERSION=$(cat $BASEDIR50/helm/common/Chart.yaml | grep version | awk '{print $2}')
+COMMON_CHART_VERSION=$(cat $BASEDIRCOMMON/Chart.yaml | grep version | awk '{print $2}')
+
+
-helm package -d /tmp $BASEDIR
_COMMON_TEMPLATE
+helm package -d /tmp $BASEDIR
COMMON
for component in $RICPLT_COMPONENTS; do
for component in $RICPLT_COMPONENTS; do