diff options
author | Michael Dürre <michael.duerre@highstreet-technologies.com> | 2022-06-13 05:45:24 +0200 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2022-07-28 09:40:20 -0400 |
commit | b62ae2e4a975ae0531426d7f02a2face4ca12bfc (patch) | |
tree | 29ddecf3dcd309f5cae30ce0d9d08701dae21fd9 /opendaylight/silicon | |
parent | 8b583df562d47c7d5190f22fe35845fd50820477 (diff) |
migrate dist to sulfur-sr0
add odl sulfur dist
(djtimoney) Fixed some dependencies to resolve issues in local build,
installed odl-restconf-nb-bierman02 karaf package to enable Bierman
RESTCONF API support
Issue-ID: CCSDK-3695
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ifd98f04f9a68c0c3923802839cdb71e12a115d09
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'opendaylight/silicon')
5 files changed, 0 insertions, 444 deletions
diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml deleted file mode 100644 index 9f789c9f..00000000 --- a/opendaylight/silicon/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-opendaylight</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> - - <artifactId>distribution-odl-silicon</artifactId> - <packaging>pom</packaging> - - <name>ccsdk-distribution :: opendaylight :: silicon</name> - <description>Creates OpenDaylight container</description> - - <modules> - <module>silicon-alpine</module> - </modules> - - <properties> - <ccsdk.opendaylight.version>0.14.2</ccsdk.opendaylight.version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.integration</groupId> - <artifactId>onap-karaf</artifactId> - <version>${ccsdk.opendaylight.version}</version> - <type>tar.gz</type> - </dependency> - </dependencies> - </dependencyManagement> -</project> diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml deleted file mode 100644 index a353ca9f..00000000 --- a/opendaylight/silicon/silicon-alpine/pom.xml +++ /dev/null @@ -1,251 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-odl-silicon</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> - - <artifactId>distribution-odl-silicon-docker</artifactId> - <packaging>pom</packaging> - - <name>ccsdk-distribution :: opendaylight :: silicon :: docker</name> - <description>Creates OpenDaylight container</description> - <organization> - <name>ONAP</name> - </organization> - - <properties> - <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name> - <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> - <odl.shiro.version>0.13.5</odl.shiro.version> - <odl.ops4j.version>7.3.16</odl.ops4j.version> - <odl.pax.logging.version>2.0.9</odl.pax.logging.version> - <patch.pax.logging.version>2.0.14</patch.pax.logging.version> - <odl.karaf.framework.version>4.3.2</odl.karaf.framework.version> - <odl.netconf.version>1.13.4</odl.netconf.version> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>get-odl-distribution</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.opendaylight.integration</groupId> - <artifactId>${odl.karaf.artifactId}</artifactId> - <version>${ccsdk.opendaylight.version}</version> - <type>tar.gz</type> - <overWrite>true</overWrite> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - <execution> - <id>copy-with-alternalte-repo-2</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.highstreet-technologies.aaa</groupId> - <artifactId>aaa-authn-api</artifactId> - <version>${odl.shiro.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory> - <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - <artifactItem> - <groupId>com.highstreet-technologies.ops4j.pax.web</groupId> - <artifactId>pax-web-jetty</artifactId> - <version>${odl.ops4j.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}</outputDirectory> - <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - <artifactItem> - <groupId>com.highstreet-technologies.netconf</groupId> - <artifactId>netconf-util</artifactId> - <version>${odl.netconf.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version}</outputDirectory> - <destFileName>netconf-util-${odl.netconf.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - <artifactItem> - <groupId>com.highstreet-technologies.netconf</groupId> - <artifactId>sal-netconf-connector</artifactId> - <version>${odl.netconf.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory> - <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - <artifactItem> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-log4j2</artifactId> - <version>${patch.pax.logging.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version}</outputDirectory> - <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - <artifactItem> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-logback</artifactId> - <version>${patch.pax.logging.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory> - <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - <artifactItem> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-api</artifactId> - <version>${patch.pax.logging.version}</version> - <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version}</outputDirectory> - <destFileName>pax-logging-api-${patch.pax.logging.version}.jar</destFileName> - <excludes>*</excludes> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/odlscripts</directory> - <includes> - <include>*</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-karaf-framework-features</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>framework-${odl.karaf.framework.version}-features.xml</include> - <include>startup.properties</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.34.0</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <noCache>true</noCache> - <contextDir>${basedir}/target/docker-stage</contextDir> - <dockerFile>Dockerfile</dockerFile> - <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - </tags> - </build> - </image> - </images> - <verbose>${docker.verbose}</verbose> - <skipPush>${docker.skip.push}</skipPush> - </configuration> - <executions> - <execution> - <id>build-push-images</id> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile deleted file mode 100644 index 19cd55f6..00000000 --- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# Prepare stage for multistage image build -## START OF STAGE0 ## -FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0 -USER root - -ENV ODL_HOME /opt/opendaylight/current - -# copy the opendaylight tar and expand -COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/ -RUN mkdir -p /opt/odl \ - && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ - && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \ - && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \ - && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \ - && ln -s /opt/opendaylight /opt/opendaylight/current - -# Enable wheel and create a group and user -RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \ - && addgroup -S odl \ - && adduser -S odl -G odl \ - && addgroup odl wheel - -# Patch some opendaylight artifacts -COPY system $ODL_HOME/system - -# Add missing scripts see SDNC-1056 -#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/ -#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt - - -# Remove vulnerable version of ops4j logging -COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml -COPY startup.properties $ODL_HOME/etc/startup.properties -RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version} -RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-logback/${odl.pax.logging.version} -RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version} - -# Changing ownership and permission of /opt -RUN chown -R odl:odl /opt && chmod -R 755 /opt - -## END OF STAGE0 ## - -################################################# - -## This will create actual image -FROM scratch -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) -USER root - -ENV JAVA_HOME=/opt/java/openjdk \ - PATH=$PATH:/opt/java/openjdk/bin \ - ODL_HOME=/opt/opendaylight/current - -# Copy Everything from stage0 -COPY --from=stage0 / / - -USER odl -EXPOSE 8181 -WORKDIR $ODL_HOME -# ENTRYPOINT exec /opt/opendaylight/bin/karaf diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml b/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml deleted file mode 100755 index 52bc1d40..00000000 --- a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<features name="framework-4.3.2" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0"> - - <!-- This file is not used in the assembly., This file is used by the karaf-maven-plugin to generate a "final" feature.xml - including the correct start-level for the generation of the startup.propertie file --> - - <feature version="4.3.2" description="Karaf core feature" name="framework" hidden="true"> - <!-- persistent wiring extension --> - <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2</bundle> - <!-- mvn: url handlers --> - <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle> - <!-- logging --> - <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle> - <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version}</bundle> - <bundle start-level="8">mvn:org.fusesource.jansi/jansi/1.18</bundle> - <!-- config admin --> - <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle> - <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle> - <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle> - <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle> - <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle> - <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2</bundle> - <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle> - <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle> - <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle> - <!-- file install --> - <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.6.8</bundle> - <!-- features service --> - <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2</bundle> - <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0</bundle> - </feature> - - <feature version="4.3.2" description="Karaf core feature" name="framework-logback" hidden="true"> - <!-- persistent wiring extension --> - <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2</bundle> - <!-- mvn: url handlers --> - <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle> - <!-- logging --> - <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle> - <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${patch.pax.logging.version}</bundle> - <!-- config admin --> - <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle> - <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle> - <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle> - <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle> - <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle> - <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2</bundle> - <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle> - <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle> - <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle> - <!-- file install --> - <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.6.8</bundle> - <!-- features service --> - <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2</bundle> - </feature> - -</features> diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties b/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties deleted file mode 100755 index 40baf708..00000000 --- a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Bundles to be started on startup, with startlevel -mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2 = 1 -mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5 -mvn\:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version} = 8 -mvn\:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version} = 8 -mvn\:org.fusesource.jansi/jansi/1.18 = 8 -mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9 -mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9 -mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9 -mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9 -mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10 -mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2 = 11 -mvn\:org.apache.felix/org.apache.felix.configurator/1.0.14 = 11 -mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6 = 11 -mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11 -mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.8 = 12 -mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2 = 15 -# The following are added by opendaylight-karaf-resources -mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7 -mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8 -mvn\:org.opendaylight.odlparent/bcprov-framework-ext/8.1.3 = 14 -mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/8.1.3 = 14 -mvn\:org.opendaylight.odlparent/logging-markers/8.1.3 = 14 -mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14 |