From 9640e5bf05192f4a614f519934802fbe31865fed Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 22 Apr 2020 10:54:20 -0400 Subject: [PATCH] Upgrade xapp-frame-go module in integration tests Use xapp-frame-go module version 0.4.8 which drops dependency on nng. Change base builder to stop using deprecated alpine3-go image. Drop prefix "/go" from dockerfile copy commands. Signed-off-by: Lott, Christopher (cl778h) Change-Id: I9df1dce576b083674290857f1c23d9b3a25ab5c6 --- docs/release-notes.rst | 3 ++- integration_tests/testxappcode/Dockerfile-delay-receiver | 4 ++-- integration_tests/testxappcode/Dockerfile-query-receiver | 4 ++-- integration_tests/testxappcode/Dockerfile-test-receiver | 4 ++-- integration_tests/testxappcode/go.mod | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) mode change 100644 => 100755 integration_tests/testxappcode/Dockerfile-delay-receiver mode change 100644 => 100755 integration_tests/testxappcode/Dockerfile-query-receiver mode change 100644 => 100755 integration_tests/testxappcode/Dockerfile-test-receiver mode change 100644 => 100755 integration_tests/testxappcode/go.mod diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 509a6e3..660f781 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -17,7 +17,8 @@ and this project adheres to `Semantic Versioning `__. [2.1.7] - 2020-04-22 -------------------- -* Switch to rmr 3.8.0 +* Upgrade to rmr 3.8.0 +* Upgrade integration tests to xapp-frame-go version 0.4.8 which drops NNG [2.1.6] - 4/7/2020 ------------------- diff --git a/integration_tests/testxappcode/Dockerfile-delay-receiver b/integration_tests/testxappcode/Dockerfile-delay-receiver old mode 100644 new mode 100755 index 486a9db..5f1d2b0 --- a/integration_tests/testxappcode/Dockerfile-delay-receiver +++ b/integration_tests/testxappcode/Dockerfile-delay-receiver @@ -16,7 +16,7 @@ # ================================================================================== # This Dockerfile uses a two stage Docker build -FROM nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 +FROM nexus3.o-ran-sc.org:10004/bldr-alpine3:10-a3.11-rmr3 # go will complain if there is a go.mod at the root of the GOPATH so we can't. RUN mkdir myxapp @@ -36,7 +36,7 @@ FROM alpine:3.11 # 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 --from=0 /myxapp/receiver . COPY delay-config-file.yaml . # rmr setup diff --git a/integration_tests/testxappcode/Dockerfile-query-receiver b/integration_tests/testxappcode/Dockerfile-query-receiver old mode 100644 new mode 100755 index a0dd473..ce861b6 --- a/integration_tests/testxappcode/Dockerfile-query-receiver +++ b/integration_tests/testxappcode/Dockerfile-query-receiver @@ -16,7 +16,7 @@ # ================================================================================== # This Dockerfile uses a two stage Docker build -FROM nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 +FROM nexus3.o-ran-sc.org:10004/bldr-alpine3:10-a3.11-rmr3 # go will complain if there is a go.mod at the root of the GOPATH so we can't. RUN mkdir myxapp @@ -36,7 +36,7 @@ FROM alpine:3.11 # 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 --from=0 /myxapp/receiver . COPY query-config-file.yaml . # rmr setup diff --git a/integration_tests/testxappcode/Dockerfile-test-receiver b/integration_tests/testxappcode/Dockerfile-test-receiver old mode 100644 new mode 100755 index 5bfd12e..6e32831 --- a/integration_tests/testxappcode/Dockerfile-test-receiver +++ b/integration_tests/testxappcode/Dockerfile-test-receiver @@ -16,7 +16,7 @@ # ================================================================================== # This Dockerfile uses a two stage Docker build -FROM nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 +FROM nexus3.o-ran-sc.org:10004/bldr-alpine3:10-a3.11-rmr3 # go will complain if there is a go.mod at the root of the GOPATH so we can't. RUN mkdir myxapp @@ -36,7 +36,7 @@ FROM alpine:3.11 # 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 --from=0 /myxapp/receiver . COPY test-config-file.yaml . # rmr setup diff --git a/integration_tests/testxappcode/go.mod b/integration_tests/testxappcode/go.mod old mode 100644 new mode 100755 index 615e4ad..7f44bd1 --- a/integration_tests/testxappcode/go.mod +++ b/integration_tests/testxappcode/go.mod @@ -3,12 +3,12 @@ go 1.13 module gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/example-xapp require ( - gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.4.2 + gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.4.8 github.com/go-openapi/runtime v0.19.11 // indirect github.com/go-openapi/spec v0.19.6 // indirect ) -replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.2 +replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.8 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.0 -- 2.16.6