From: ss412g <shuky.har-noy@intl.att.com>
Date: Thu, 28 Nov 2019 14:48:51 +0000 (+0200)
Subject: Add go-acc to build, upgrade rmr to 1.12.0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=32b44524d997f5330da74f9936e27b657698156b;hp=94379ccc19f898040242a944e473360d2d2324f1;p=ric-plt%2Fe2mgr.git

Add go-acc to build, upgrade rmr to 1.12.0

Change-Id: I01770b56c087c3d7473a177ea88b4ef1070a028c
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>
---

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
index 10a6960..929a00a 100644
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -16,17 +16,17 @@
 #
 ##############################################################################
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:2-u16.04-nng as ubuntu
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ubuntu
 
 WORKDIR /opt/E2Manager
 COPY . . 
 ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin
 #RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr && cd rmr/; mkdir build; cd build; /opt/bin/cmake -DDEV_PKG=1 ..; make install
 # Install RMr library and dev files
-RUN wget --content-disposition  https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.10.0_amd64.deb/download.deb
-RUN dpkg -i rmr_1.10.0_amd64.deb
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.10.0_amd64.deb/download.deb
-RUN dpkg -i rmr-dev_1.10.0_amd64.deb
+RUN wget --content-disposition  https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.12.0_amd64.deb/download.deb
+RUN dpkg -i rmr_1.12.0_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.12.0_amd64.deb/download.deb
+RUN dpkg -i rmr-dev_1.12.0_amd64.deb
 
 RUN cd asn1codec && make  
 RUN go build app/main.go
@@ -42,7 +42,7 @@ ENV LD_LIBRARY_PATH=/usr/local/lib
 ENV GODEBUG=cgocheck=2,clobberfree=1,gcstoptheworld=2,allocfreetrace=0
 ENV RIC_ID="bbbccc-abcd0e/20"
 ENV RMR_SEED_RT=/opt/E2Manager/router_test.txt
-RUN go test ./...
+RUN go-acc $(go list ./... | grep -v e2mgr/mocks | grep -v e2mgr/tests |grep -v e2mgr/e2managererrors| grep -v e2mgr/enums)
 
 FROM ubuntu:16.04
 
diff --git a/E2Manager/container-tag.yaml b/E2Manager/container-tag.yaml
index ecd34c6..eb41861 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: 3.0.1
+tag: 3.0.2