From 600b944034c115ce4a4e5a1f584053dcc1ac1dfe Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Mon, 24 Aug 2020 15:43:29 +0200 Subject: [PATCH] Add oran a1-adapter feature to odlsli-alpine Change-Id: I32e11d4dca0eb112785f91fc0c3a930dcd7ddb5f Issue-ID: CCSDK-2604 Signed-off-by: RehanRaza --- odlsli/odlsli-alpine/pom.xml | 7 +++++++ odlsli/odlsli-alpine/src/main/docker/Dockerfile | 3 ++- platform-logic/installer/pom.xml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index d81163d6..a4160dfe 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -294,6 +294,13 @@ repo zip + + org.onap.ccsdk.oran + a1-adapter-installer + ${ccsdk.oran.a1adapter.version} + repo + zip + org.onap.ccsdk.features.sdnr.northbound CMNotify-installer diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index 024043b6..fd3cd0c6 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -31,6 +31,7 @@ ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.f ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features +ENV A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} @@ -49,7 +50,7 @@ COPY --from=stage0 --chown=odl:odl /opt /opt # Add CCSDK repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${A1ADAPTER_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg USER odl diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 4f3347d4..25c3192e 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -16,7 +16,7 @@ Contains platform-level service logic installer - 1.0.0-SNAPSHOT + 1.0.0 -- 2.16.6