From 53cb68740aa0cff8102f68c245f3db1289a92e01 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 30 Jul 2019 12:13:33 -0400 Subject: Updates for ODL Neon Update to build ODLSLI based on OpenDaylight Neon. Change-Id: I85cbdf38d385f3a4ef15e8fe7939af788c350de1 Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) --- alpine/pom.xml | 4 ++-- ansible-server/pom.xml | 4 ++-- dependencies/pom.xml | 4 ++-- dgbuilder-docker/pom.xml | 4 ++-- dgbuilder/pom.xml | 4 ++-- odlsli/odlsli-alpine/pom.xml | 16 ++++++++-------- odlsli/odlsli-alpine/src/main/docker/Dockerfile | 5 +++++ odlsli/odlsli-ubuntu/pom.xml | 12 ++++++------ odlsli/pom.xml | 5 ++--- opendaylight/neon/neon-alpine/pom.xml | 4 ++-- opendaylight/neon/pom.xml | 4 ++-- opendaylight/pom.xml | 6 ++---- platform-logic/asdc-api/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/oofpcipoc-api/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/restapi-templates/pom.xml | 4 ++-- platform-logic/sliapi/pom.xml | 4 ++-- pom.xml | 4 ++-- saltstack-server/pom.xml | 4 ++-- ubuntu/pom.xml | 4 ++-- version.properties | 4 ++-- 22 files changed, 57 insertions(+), 55 deletions(-) diff --git a/alpine/pom.xml b/alpine/pom.xml index 21a458a5..5cdd262b 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-alpine - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: alpine diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 3e29bba9..8f347280 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.ccsdk.distribution ansible-server - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk :: distribution :: ${project.artifactId} Creates ansible-server Docker container diff --git a/dependencies/pom.xml b/dependencies/pom.xml index a45ed4fd..f1339d17 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3 + 1.4.0-SNAPSHOT org.onap.ccsdk.distribution dependencies - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution:: dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index a51f3922..91f17157 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder-docker - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: dgbuilder-docker diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 55c233db..ec93d2f4 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: dgbuilder diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 723b088e..2bee0803 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3 + 1.4.0-SNAPSHOT org.onap.ccsdk.distribution distribution-odlsli-alpine - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: odlsli-alpine @@ -21,11 +21,11 @@ - onap/ccsdk-odl-fluorine-alpine-image + onap/ccsdk-odl-neon-alpine-image onap/ccsdk-odlsli-alpine-image ${project.version} ${maven.build.timestamp} - 0.5.2 + 0.6.0-SNAPSHOT ${https_proxy} yyyyMMdd'T'HHmmss'Z' opt/opendaylight @@ -36,10 +36,10 @@ ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all ${odl.features.extra},${ccsdk.odl.features} - 0.5.2 - 0.5.2 - 0.5.2 - 0.5.2 + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index 97c5ae4c..024043b6 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -37,9 +37,14 @@ ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} # Install sudo and IP utilities RUN apk update && apk --no-cache add sudo iputils openssl + # Enable wheel group RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers +# Create odl user +RUN addgroup -S odl && adduser -S odl -G odl +RUN addgroup odl wheel + COPY --from=stage0 --chown=odl:odl /opt /opt # Add CCSDK repositories to boot repositories diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 63da0daa..ede48242 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3 + 1.4.0-SNAPSHOT @@ -25,7 +25,7 @@ onap/ccsdk-odlsli-image ${project.version} ${maven.build.timestamp} - 0.5.2 + 0.6.0-SNAPSHOT ${https_proxy} yyyyMMdd'T'HHmmss'Z' opt/opendaylight @@ -36,10 +36,10 @@ ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all ${odl.features.extra},${ccsdk.odl.features} - 0.5.2 - 0.5.2 - 0.5.2 - 0.5.2 + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 98986b01..0e12e261 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-odlsli - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: odlsli Creates ODLSLI containers - odlsli-ubuntu odlsli-alpine diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml index 0213c3a9..ad274cfd 100644 --- a/opendaylight/neon/neon-alpine/pom.xml +++ b/opendaylight/neon/neon-alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-odl-neon - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-odl-neon-alpine - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: opendaylight :: ${project.artifactId} diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml index 6564b682..3dbf5e16 100644 --- a/opendaylight/neon/pom.xml +++ b/opendaylight/neon/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-opendaylight - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-odl-neon - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 6fe03144..d91a4d8c 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,19 +5,17 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-opendaylight - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: opendaylight Creates OpenDaylight container - fluorine neon - diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index f92b6ad6..39cd6571 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT platform-logic-asdcapi - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 2a77aa80..ee6a2d03 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT platform-logic-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index b7ec28c3..00a905dd 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT platform-logic-oofpcipocapi - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 0051aca3..adee554f 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-platform-logic - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index d89e1f57..0f54a8a4 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT platform-logic-restapi-templates - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 896120b6..cf6fc5a1 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT platform-logic-sliapi - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index a4dc0fc0..b02e5d07 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3 + 1.4.0-SNAPSHOT org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index 9310b1a2..7e9f1e88 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT saltstack-server - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 55a05586..0f88ebc0 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT distribution-ubuntu - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-distribution :: ubuntu diff --git a/version.properties b/version.properties index 6a35b903..50be578e 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=0 -sprint_number=5 -feature_revision=2 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg