From: wahidw <abdulwahid.w@nokia.com>
Date: Mon, 1 Feb 2021 07:57:46 +0000 (+0000)
Subject: Taking RMR v4.5.2 to use
X-Git-Tag: 5.4.17~6
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=cf18486fb916be40e91d8f6f843e3d1ebb9ed85e;p=ric-plt%2Fe2mgr.git

Taking RMR v4.5.2 to use

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I1d50ad4d9a75f7674a4ecb4de6dd11b2148e96d3
---

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
index 3fa55df..27ad56a 100755
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -20,7 +20,7 @@
 #   platform project (RICP).
 #
 
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as ubuntu
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as ubuntu
 
 WORKDIR /opt/E2Manager
 COPY . .
diff --git a/E2Manager/build-e2mgr-ubuntu.sh b/E2Manager/build-e2mgr-ubuntu.sh
index 04e2d4c..280df69 100755
--- a/E2Manager/build-e2mgr-ubuntu.sh
+++ b/E2Manager/build-e2mgr-ubuntu.sh
@@ -31,11 +31,11 @@ set -eux
 echo "--> e2mgr-build-ubuntu.sh"
 
 # Install RMR from deb packages at packagecloud.io
-rmr=rmr_4.4.6_amd64.deb
+rmr=rmr_4.5.2_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/$rmr/download.deb
 sudo dpkg -i $rmr
 rm $rmr
-rmrdev=rmr-dev_4.4.6_amd64.deb
+rmrdev=rmr-dev_4.5.2_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/$rmrdev/download.deb
 sudo dpkg -i $rmrdev
 rm $rmrdev
diff --git a/E2Manager/container-tag.yaml b/E2Manager/container-tag.yaml
index 2f7773e..d21ca0d 100644
--- a/E2Manager/container-tag.yaml
+++ b/E2Manager/container-tag.yaml
@@ -1,4 +1,4 @@
 # The Jenkins job requires a tag to build the Docker image.
 # Global-JJB script assumes this file is in the repo root.
 ---
-tag: 5.4.15
+tag: 5.4.16