From 96acf3c26ec1dbf6b75f88b9256a131e67a3721c Mon Sep 17 00:00:00 2001
From: "David M. Johnson" <johnsond@flux.utah.edu>
Date: Thu, 3 Sep 2020 17:07:07 -0600
Subject: [PATCH] Add bronze support and make it the default instead of master.
---
profile.py | 5 +++--
setup-lib.sh | 2 +-
setup-ric.sh | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/profile.py b/profile.py
index 44bbd4f..f62c8db 100755
--- a/profile.py
+++ b/profile.py
@@ -13,8 +13,9 @@ pc = portal.Context()
pc.defineParameter(
"ricBranch","RIC E2 Component Branch",
portal.ParameterType.STRING,
- 'master',[('r2','r2'),('Amber','Amber'),('master','master')],
- longDescription="Which branch/release you want to use for the e2term and e2mgr components. Other components are pulled from the master branch.")
+ 'bronze',[('bronze','bronze'),('master','master (caution)'),
+ ('r2','r2 (unsupported)'),('Amber','Amber (unsupported)')],
+ longDescription="Which branch/release you want to use for the e2term and e2mgr components. Other components are pulled from the master branch. If you use the master branch for the E2 components, things may be unstable.")
pc.defineParameter(
"type","Hardware Type",portal.ParameterType.NODETYPE,"d740",
longDescription="Hardware type, if physical node or dedicated VM.")
diff --git a/setup-lib.sh b/setup-lib.sh
index f5a6e81..72596db 100755
--- a/setup-lib.sh
+++ b/setup-lib.sh
@@ -81,7 +81,7 @@ DOAPTUPDATE=1
DO_APT_INSTALL=1
UBUNTUMIRRORHOST=""
UBUNTUMIRRORPATH=""
-RICBRANCH="master"
+RICBRANCH="bronze"
##
## Setup apt-get (to not prompt us); define some package helpers.
diff --git a/setup-ric.sh b/setup-ric.sh
index 1f19812..cd58e12 100755
--- a/setup-ric.sh
+++ b/setup-ric.sh
@@ -117,7 +117,7 @@ if [ ! $? -eq 0 -o $UPDATEIMAGES = "1" ]; then
cd ../..
fi
-if [ "$RICBRANCH" = "master" ]; then
+if [ "$RICBRANCH" = "master" -o "$RICBRANCH" = "bronze" ]; then
$SUDO docker image inspect e2rtmansim:latest >/dev/null 2>&1
if [ ! $? -eq 0 -o $UPDATEIMAGES = "1" ]; then
$SUDO docker pull nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng
@@ -231,7 +231,7 @@ remove_container() {
remove_container db
$SUDO docker run -d --network ric --ip $DBAAS_IP --name db dbaas:latest
-if [ "$RICBRANCH" = "master" ]; then
+if [ "$RICBRANCH" = "master" -o "$RICBRANCH" = "bronze" ]; then
remove_container e2rtmansim
$SUDO docker run -d -it --network ric --ip $E2RTMANSIM_IP \
--name e2rtmansim e2rtmansim:latest
@@ -245,7 +245,7 @@ $SUDO docker run -d -it --network ric --ip $E2MGR_IP -e RIC_ID=7b0000-000000/18
--name e2mgr e2mgr:latest
remove_container e2term
-if [ "$RICBRANCH" = "master" ]; then
+if [ "$RICBRANCH" = "master" -o "$RICBRANCH" = "bronze" ]; then
E2TERMCONFFILE=`pwd`/e2term_config.conf
if [ ! -e $E2TERMCONFFILE ]; then
cat <<EOF >$E2TERMCONFFILE
--
GitLab