From c79cb5c4c7a3f1a0e2acfcd5c62c1bcbe1310b69 Mon Sep 17 00:00:00 2001 From: herbert Date: Wed, 18 Mar 2020 15:30:23 +0100 Subject: [PATCH] Move to release parent Move to 1.5.2 parent Issue-ID: OAM-67 Signed-off-by: herbert Change-Id: Icd2b49ce0b15a06ba753080418db2d6e65edfeb4 Signed-off-by: herbert --- distribution/nonrtric-o1-controller-frankfurt/pom.xml | 3 ++- .../nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile | 9 +++++++-- features/devicemanager/o-ran/ru-fh/feature/pom.xml | 2 +- features/devicemanager/o-ran/ru-fh/installer/pom.xml | 2 +- features/devicemanager/o-ran/ru-fh/model/pom.xml | 2 +- features/devicemanager/o-ran/ru-fh/pom.xml | 2 +- features/devicemanager/o-ran/ru-fh/provider/pom.xml | 2 +- features/devicemanager/x-ran/ru-fh/feature/pom.xml | 2 +- features/devicemanager/x-ran/ru-fh/installer/pom.xml | 2 +- features/devicemanager/x-ran/ru-fh/model/pom.xml | 2 +- features/devicemanager/x-ran/ru-fh/pom.xml | 2 +- features/devicemanager/x-ran/ru-fh/provider/pom.xml | 2 +- features/pom.xml | 2 +- 13 files changed, 20 insertions(+), 14 deletions(-) diff --git a/distribution/nonrtric-o1-controller-frankfurt/pom.xml b/distribution/nonrtric-o1-controller-frankfurt/pom.xml index cdf07f1..df327ce 100644 --- a/distribution/nonrtric-o1-controller-frankfurt/pom.xml +++ b/distribution/nonrtric-o1-controller-frankfurt/pom.xml @@ -23,7 +23,8 @@ - nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-20200225T124813Z + hightec/sdnc-image-wt-patch:latest + o-ran-sc/${project.artifactId} ${maven.build.timestamp} ${project.version} diff --git a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile index 9482d2f..79bafef 100644 --- a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile +++ b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile @@ -1,7 +1,12 @@ # Base odl alpine with added packages needed for FROM ${base.image.repo} -ENV SDNR_ORAN_REPO ${features.repo} -RUN sed -i -e "\|featuresRepositories|s|$|,${SDNR_ORAN_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg + +# Image info +ENV IMAGEPATH ${IMAGEPATH}//${image.name} +ENV IMAGENAMES ${IMAGENAMES}//"ORAN nonrtric" + +# Adjust repo und feature boot info for karaf +RUN sed -i -e "\|featuresRepositories|s|$|,${features.repo}|" $ODL_HOME/etc/org.apache.karaf.features.cfg ENV SDNRWT_BOOTFEATURES ${features.boot} USER root diff --git a/features/devicemanager/o-ran/ru-fh/feature/pom.xml b/features/devicemanager/o-ran/ru-fh/feature/pom.xml index a6eb0c9..ea5fefd 100644 --- a/features/devicemanager/o-ran/ru-fh/feature/pom.xml +++ b/features/devicemanager/o-ran/ru-fh/feature/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/o-ran/ru-fh/installer/pom.xml b/features/devicemanager/o-ran/ru-fh/installer/pom.xml index 8b9d460..4f798d4 100644 --- a/features/devicemanager/o-ran/ru-fh/installer/pom.xml +++ b/features/devicemanager/o-ran/ru-fh/installer/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/o-ran/ru-fh/model/pom.xml b/features/devicemanager/o-ran/ru-fh/model/pom.xml index bfb761e..ceb4169 100644 --- a/features/devicemanager/o-ran/ru-fh/model/pom.xml +++ b/features/devicemanager/o-ran/ru-fh/model/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/o-ran/ru-fh/pom.xml b/features/devicemanager/o-ran/ru-fh/pom.xml index 548063a..20836d1 100644 --- a/features/devicemanager/o-ran/ru-fh/pom.xml +++ b/features/devicemanager/o-ran/ru-fh/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/o-ran/ru-fh/provider/pom.xml b/features/devicemanager/o-ran/ru-fh/provider/pom.xml index 2d0da91..d7f9fbd 100644 --- a/features/devicemanager/o-ran/ru-fh/provider/pom.xml +++ b/features/devicemanager/o-ran/ru-fh/provider/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/x-ran/ru-fh/feature/pom.xml b/features/devicemanager/x-ran/ru-fh/feature/pom.xml index 42cd8b6..ff05924 100644 --- a/features/devicemanager/x-ran/ru-fh/feature/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/feature/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/x-ran/ru-fh/installer/pom.xml b/features/devicemanager/x-ran/ru-fh/installer/pom.xml index a8c8ea1..de31294 100755 --- a/features/devicemanager/x-ran/ru-fh/installer/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/installer/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/x-ran/ru-fh/model/pom.xml b/features/devicemanager/x-ran/ru-fh/model/pom.xml index 4456c8b..dd0b95e 100644 --- a/features/devicemanager/x-ran/ru-fh/model/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/model/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/x-ran/ru-fh/pom.xml b/features/devicemanager/x-ran/ru-fh/pom.xml index f2e8db9..f4e46b2 100755 --- a/features/devicemanager/x-ran/ru-fh/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/devicemanager/x-ran/ru-fh/provider/pom.xml b/features/devicemanager/x-ran/ru-fh/provider/pom.xml index 7c781ee..5ddc7da 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/provider/pom.xml @@ -29,7 +29,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/pom.xml b/features/pom.xml index 792fa54..87a72a9 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -22,7 +22,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 -- 2.16.6