From f7ddd997fdcffaff332dfc8aba50a49c9cd1e72c Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 22 Apr 2020 09:05:32 -0400 Subject: [PATCH] Upgrade to RMR library version 3.8.0 Pull shared object file from new Alpine3 bldr image in release registry Bump version to 2.1.7 Signed-off-by: Lott, Christopher (cl778h) Change-Id: I3076b7ab941e0ee6728d4350456c29c931c75088 --- Dockerfile | 4 ++-- Dockerfile-Unit-Test | 4 ++-- docs/release-notes.rst | 5 +++++ integration_tests/install_rmr.sh | 2 +- integration_tests/testxappcode/Dockerfile-delay-receiver | 5 ++++- integration_tests/testxappcode/Dockerfile-query-receiver | 5 ++++- integration_tests/testxappcode/Dockerfile-test-receiver | 5 ++++- rmr-version.yaml | 2 +- setup.py | 2 +- 9 files changed, 24 insertions(+), 10 deletions(-) mode change 100755 => 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile old mode 100755 new mode 100644 index 6a57a7e..bd18fe7 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,8 @@ FROM python:3.8-alpine RUN mkdir -p /opt/route/ # python copy; this basically makes the 2 stage python build work COPY --from=compile-image /home/a1user/.local /home/a1user/.local -# copy rmr .so from the builder image -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so # Switch to a non-root user for security reasons. a1 does not currently write into any dirs so no chowns are needed at this time. RUN addgroup -S a1user && adduser -S -G a1user a1user USER a1user diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test index 943a98e..097d4f3 100644 --- a/Dockerfile-Unit-Test +++ b/Dockerfile-Unit-Test @@ -16,8 +16,8 @@ # ================================================================================== FROM python:3.8-alpine -# copy rmr .so from the builder image -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so # dir that rmr routing file temp goes into RUN mkdir -p /opt/route/ diff --git a/docs/release-notes.rst b/docs/release-notes.rst index c153413..509a6e3 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -14,6 +14,11 @@ and this project adheres to `Semantic Versioning `__. :depth: 3 :local: +[2.1.7] - 2020-04-22 +-------------------- + +* Switch to rmr 3.8.0 + [2.1.6] - 4/7/2020 ------------------- :: diff --git a/integration_tests/install_rmr.sh b/integration_tests/install_rmr.sh index 1d26594..95f6beb 100755 --- a/integration_tests/install_rmr.sh +++ b/integration_tests/install_rmr.sh @@ -1,5 +1,5 @@ #!/bin/sh -git clone --branch 3.6.3 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \ +git clone --branch 3.8.0 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \ && cd rmr \ && mkdir .build; cd .build \ && echo "<<>>" \ diff --git a/integration_tests/testxappcode/Dockerfile-delay-receiver b/integration_tests/testxappcode/Dockerfile-delay-receiver index 03725a1..486a9db 100644 --- a/integration_tests/testxappcode/Dockerfile-delay-receiver +++ b/integration_tests/testxappcode/Dockerfile-delay-receiver @@ -32,7 +32,10 @@ RUN go build -a -installsuffix cgo -o receiver receiver.go # 2nd stage FROM alpine:3.11 -COPY --from=0 /usr/local/lib64/librmr_si.so* /usr/local/lib64/ + +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so + COPY --from=0 /go/myxapp/receiver . COPY delay-config-file.yaml . diff --git a/integration_tests/testxappcode/Dockerfile-query-receiver b/integration_tests/testxappcode/Dockerfile-query-receiver index e45b15a..a0dd473 100644 --- a/integration_tests/testxappcode/Dockerfile-query-receiver +++ b/integration_tests/testxappcode/Dockerfile-query-receiver @@ -32,7 +32,10 @@ RUN go build -a -installsuffix cgo -o receiver receiver.go # 2nd stage FROM alpine:3.11 -COPY --from=0 /usr/local/lib64/librmr_si.so* /usr/local/lib64/ + +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so + COPY --from=0 /go/myxapp/receiver . COPY query-config-file.yaml . diff --git a/integration_tests/testxappcode/Dockerfile-test-receiver b/integration_tests/testxappcode/Dockerfile-test-receiver index 3b9cc3d..5bfd12e 100644 --- a/integration_tests/testxappcode/Dockerfile-test-receiver +++ b/integration_tests/testxappcode/Dockerfile-test-receiver @@ -32,7 +32,10 @@ RUN go build -a -installsuffix cgo -o receiver receiver.go # 2nd stage FROM alpine:3.11 -COPY --from=0 /usr/local/lib64/librmr_si.so* /usr/local/lib64/ + +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so + COPY --from=0 /go/myxapp/receiver . COPY test-config-file.yaml . diff --git a/rmr-version.yaml b/rmr-version.yaml index 2d82c45..7f7e478 100644 --- a/rmr-version.yaml +++ b/rmr-version.yaml @@ -1,3 +1,3 @@ # CI script installs RMR from PackageCloud using this version --- -version: 3.6.3 +version: 3.8.0 diff --git a/setup.py b/setup.py index 67e2765..93728b2 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ from setuptools import setup, find_packages setup( name="a1", - version="2.1.6", + version="2.1.7", packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter", description="RIC A1 Mediator for policy/intent changes", -- 2.16.6