From 438a0a662e2e67af7f248f9715b54f92efc4a80c Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Tue, 18 Jun 2019 06:50:13 -0400 Subject: [PATCH] Use base Docker image with NNG v1.1.1 Install RMr via deb packge from Package Cloud in all three Dockerfiles Bump version to 0.8.3. Signed-off-by: Lott, Christopher (cl778h) Change-Id: Iaf8cbd3fb5529d765cf6e9e1c947c4fb2005cd4c --- Dockerfile | 26 ++++++++++++-------------- container-tag.yaml | 2 +- docs/developer-guide.rst | 4 ++-- docs/release-notes.rst | 9 +++++++++ integration_tests/Dockerfile | 18 ++++++++---------- integration_tests/Dockerfile-Bombard | 18 ++++++++---------- integration_tests/a1mediator/Chart.yaml | 2 +- setup.py | 2 +- 8 files changed, 42 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index be8d8da..9373cc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,27 +16,25 @@ # ================================================================================== # CI to build a Docker image with the A1 mediator -# Adds gcc and cmake to build RMr library +# Relies on NNG from base image +# Installs RMr using debian package hosted at packagecloud.io -FROM python:3.7 +FROM nexus3.o-ran-sc.org:10004/bldr-debian-python-nng:2-py3.7-nng1.1.1 -ADD . /tmp +COPY . /tmp +WORKDIR /tmp -# Install RMr -RUN apt-get update && apt-get install -y gcc git cmake -RUN git clone https://gerrit.oran-osc.org/r/ric-plt/lib/rmr -WORKDIR rmr -# This pins RMr to a known working version -RUN git checkout 68d09fa5028e47e763c44c30647da31e77eda64a -RUN mkdir .build; cd .build; cmake ..; make install +# Install RMr library +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_1.0.34_amd64.deb/download.deb +RUN dpkg -i rmr_1.0.34_amd64.deb -# Install python-rmr +# Install RMr python bindings RUN pip install --upgrade pip +RUN pip install rmr==0.10.1 -#install a1 -WORKDIR /tmp +# install a1 -# Run our unit tests +# Prereq for unit tests RUN pip install tox RUN tox diff --git a/container-tag.yaml b/container-tag.yaml index fe6847c..623599d 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -1,4 +1,4 @@ # The Jenkins job uses this string for the tag in the image name # for example nexus3.o-ran-sc.org:10004/my-image-name:my-tag --- -tag: 0.8.2 +tag: 0.8.3 diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index 5d2d781..60c1d9a 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -37,9 +37,9 @@ This project follows semver. When changes are made, the versions are in: 3) ``container-tag.yaml`` -4) ``integration_tests/a1mediator/values.yaml + ``Chart.yaml`` +4) ``integration_tests/a1mediator/Chart.yaml`` -6) ``a1/openapi.yml`` +6) ``a1/openapi.yml`` (this is an API version, not a software version) 7) in the it/dep repo that contains a1 helm chart, ``values.yaml``, ``Chart.yml`` diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 8f40dc8..8cfeee6 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -24,6 +24,15 @@ The format is based on `Keep a Changelog `__ and this project adheres to `Semantic Versioning `__. +[0.8.3] - 6/18/2019 +------------------- + +:: + + * Use base Docker with NNG version 1.1.1 + + + [0.8.2] - 6/5/2019 ------------------- diff --git a/integration_tests/Dockerfile b/integration_tests/Dockerfile index b86d5e1..321c729 100644 --- a/integration_tests/Dockerfile +++ b/integration_tests/Dockerfile @@ -14,19 +14,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== -FROM python:3.7 -ADD receiver.py / +FROM nexus3.o-ran-sc.org:10004/bldr-debian-python-nng:2-py3.7-nng1.1.1 -# Install RMR -RUN apt-get update && apt-get install -y gcc git cmake -RUN git clone https://gerrit.oran-osc.org/r/ric-plt/lib/rmr -WORKDIR rmr -RUN git checkout 68d09fa5028e47e763c44c30647da31e77eda64a -RUN mkdir .build; cd .build; cmake ..; make install +COPY receiver.py / -# Install python-rmr -RUN pip install --upgrade pip +# Install RMr +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_1.0.34_amd64.deb/download.deb +RUN dpkg -i rmr_1.0.34_amd64.deb + +# Install RMr python bindings +RUN pip install --upgrade pip RUN pip install rmr==0.10.1 # rmr setups diff --git a/integration_tests/Dockerfile-Bombard b/integration_tests/Dockerfile-Bombard index 61ccff4..840052f 100644 --- a/integration_tests/Dockerfile-Bombard +++ b/integration_tests/Dockerfile-Bombard @@ -14,19 +14,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== -FROM python:3.7 -ADD bombard.py / +FROM nexus3.o-ran-sc.org:10004/bldr-debian-python-nng:2-py3.7-nng1.1.1 -# Install RMR -RUN apt-get update && apt-get install -y gcc git cmake -RUN git clone https://gerrit.oran-osc.org/r/ric-plt/lib/rmr -WORKDIR rmr -RUN git checkout 68d09fa5028e47e763c44c30647da31e77eda64a -RUN mkdir .build; cd .build; cmake ..; make install +COPY bombard.py / -# Install python-rmr -RUN pip install --upgrade pip +# Install RMr +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_1.0.34_amd64.deb/download.deb +RUN dpkg -i rmr_1.0.34_amd64.deb + +# Install RMr python bindings +RUN pip install --upgrade pip RUN pip install rmr==0.10.1 # rmr setups diff --git a/integration_tests/a1mediator/Chart.yaml b/integration_tests/a1mediator/Chart.yaml index 3f8cbde..ab5ee57 100644 --- a/integration_tests/a1mediator/Chart.yaml +++ b/integration_tests/a1mediator/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 description: A1 Helm chart for Kubernetes name: a1mediator -version: 0.8.2 +version: 0.8.3 diff --git a/setup.py b/setup.py index 706df32..66be986 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ from setuptools import setup, find_packages setup( name="a1", - version="0.8.2", + version="0.8.3", packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter", description="RIC A1 Mediator for policy/intent changes", -- 2.16.6