From f7fb148a017bbe11889b7d818ae0d0e883cee3a9 Mon Sep 17 00:00:00 2001 From: "aa7133@att.com" Date: Tue, 28 Apr 2020 16:21:03 +0300 Subject: [PATCH] 4.0.10 upgrade rmr to 4.02 Change-Id: I29d3fb81c7bf55a2449d9491fb1c5b444932ad34 Signed-off-by: aa7133@att.com --- RIC-E2-TERMINATION/CMakeLists.txt | 2 -- RIC-E2-TERMINATION/Dockerfile | 13 ++++++------- RIC-E2-TERMINATION/container-tag.yaml | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/RIC-E2-TERMINATION/CMakeLists.txt b/RIC-E2-TERMINATION/CMakeLists.txt index bbf3426..75f27b1 100644 --- a/RIC-E2-TERMINATION/CMakeLists.txt +++ b/RIC-E2-TERMINATION/CMakeLists.txt @@ -115,7 +115,6 @@ add_executable(e2 RIC-E2-TERMINATION/sctpThread.cpp RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.hpp RIC-E2-TERMINATION/BuildXml.h) target_link_libraries(e2 libasn1ce2smcodec.a) -target_link_libraries(e2 librmr_nng.a) target_link_libraries(e2 librmr_si.a) target_link_libraries(e2 libicui18n.a) target_link_libraries(e2 libicuuc.a) @@ -147,7 +146,6 @@ add_executable(sctpClient #RIC-E2-TERMINATION/TEST/T1/ ) target_link_libraries(sctpClient libpistache.a) -target_link_libraries(sctpClient librmr_nng.a) target_link_libraries(sctpClient librmr_si.a) #target_link_libraries(sctpClient libnng.a) diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index 40c685b..f617363 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -36,11 +36,10 @@ COPY . /opt/e2/RIC-E2-TERMINATION/ RUN mv /opt/e2/RIC-E2-TERMINATION/CMakeLists.txt /opt/e2/ && cat /opt/e2/RIC-E2-TERMINATION/config/config.conf \ && wget --content-disposition https://github.com/cgreen-devs/cgreen/releases/download/1.2.0/cgreen_1.2.0_amd64.deb \ && dpkg -i cgreen_1.2.0_amd64.deb \ - && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_3.8.2_amd64.deb/download.deb \ - && dpkg -i rmr_3.8.2_amd64.deb \ - && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_3.8.2_amd64.deb/download.deb \ - - && dpkg -i rmr-dev_3.8.2_amd64.deb \ + && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_4.0.2_amd64.deb/download.deb \ + && dpkg -i rmr_4.0.2_amd64.deb \ + && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_4.0.2_amd64.deb/download.deb \ + && dpkg -i rmr-dev_4.0.2_amd64.deb \ && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog_0.0.4-1_amd64.deb/download.deb \ && dpkg -i mdclog_0.0.4-1_amd64.deb \ && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog-dev_0.0.4-1_amd64.deb/download.deb \ @@ -87,8 +86,8 @@ COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/startup.sh /opt/e2/startup.sh #COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/tracelibcpp/build/libtracelibcpp.so.0.0.2 /usr/local/lib/libtracelibcpp.so.0.0.2 -COPY --from=ubuntu /usr/local/lib/librmr_si.so.3.8.2 /usr/local/lib/librmr_si.so.3.8.2 -COPY --from=ubuntu /usr/local/lib/librmr_si.so.3 /usr/local/lib/librmr_si.so.3 +COPY --from=ubuntu /usr/local/lib/librmr_si.so.4.0.2 /usr/local/lib/librmr_si.so.4.0.2 +COPY --from=ubuntu /usr/local/lib/librmr_si.so.4 /usr/local/lib/librmr_si.so.4 COPY --from=ubuntu /usr/local/lib/librmr_si.so /usr/local/lib/librmr_si.so COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libmdclog.so /usr/local/lib/libmdclog.so diff --git a/RIC-E2-TERMINATION/container-tag.yaml b/RIC-E2-TERMINATION/container-tag.yaml index c1d2376..8c395d4 100644 --- a/RIC-E2-TERMINATION/container-tag.yaml +++ b/RIC-E2-TERMINATION/container-tag.yaml @@ -1,3 +1,3 @@ # The Jenkins job requires a tag to build the Docker image. # Global-JJB script assumes this file is in the repo root. -tag: 4.0.9 +tag: 4.0.10 -- 2.16.6