X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=build%2Fbuild_ubuntu.sh;h=28f0a6f52953070906b338b63b3d0a7ea9a6f3bd;hb=99018ce462a2b306183e0077448a5548d38c1089;hp=3e94016244c437891ef824a40cc2c39e4d00ff3c;hpb=121e8b6026904eb245c6f8ac805efa7c3dad3ae5;p=ric-plt%2Falarm-go.git

diff --git a/build/build_ubuntu.sh b/build/build_ubuntu.sh
index 3e94016..28f0a6f 100755
--- a/build/build_ubuntu.sh
+++ b/build/build_ubuntu.sh
@@ -22,11 +22,11 @@ set -eux
 echo "--> build_ubuntu.sh starts"
 
 # Install RMR from deb packages at packagecloud.io
-rmr=rmr_4.0.2_amd64.deb
+rmr=rmr_4.1.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.0.2_amd64.deb
+rmrdev=rmr-dev_4.1.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
@@ -42,12 +42,17 @@ export PATH=$GOPATH/bin:$PATH
 export CFG_FILE=../config/config-file.json
 export RMR_SEED_RT=../config/uta_rtg.rt
 
+# xApp stuff
+export DEF_FILE=../definitions/alarm-definition.json
+export PERF_DEF_FILE=../testresources/perf-alarm-definition.json
+export PERF_OBJ_FILE=../testresources/perf-alarm-object.json
+
 GO111MODULE=on GO_ENABLED=0 GOOS=linux
 
 # setup version tag
-if [ -f container-tag.yaml ]
+if [ -f build/container-tag.yaml ]
 then
-    tag=$(grep "tag:" container-tag.yaml | awk '{print $2}')
+    tag=$(grep "tag:" build/container-tag.yaml | awk '{print $2}')
 else
     tag="no-tag-found"
 fi
@@ -56,6 +61,10 @@ hash=$(git rev-parse --short HEAD || true)
 
 ROOT_DIR=$PWD
 
+
+# compile the CLI
+cd ${ROOT_DIR}/cli && go build -a -installsuffix cgo alarm-cli.go
+
 # Build
 cd ${ROOT_DIR}/manager && go build -a -installsuffix cgo -ldflags "-X main.Version=$tag -X main.Hash=$hash" -o alarm-manager ./cmd/*.go
 
@@ -65,7 +74,4 @@ cd ${ROOT_DIR}/alarm && go test . -v -coverprofile cover.out
 # And for the Alarm Manager
 cd ${ROOT_DIR}/manager && go test -v -p 1 -coverprofile cover.out ./cmd/ -c -o ./manager_test && ./manager_test
 
-# Finally compile the CLI
-cd ${ROOT_DIR}/cli && go build -a -installsuffix cgo alarm-cli.go
-
 echo "--> build_ubuntu.sh ends"