diff options
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 119 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 8 |
2 files changed, 52 insertions, 75 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 827ab4a7..9f6a986b 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -8,9 +8,7 @@ <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odlsli-alpine</artifactId> - <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli-alpine</name> @@ -20,7 +18,7 @@ </organization> <properties> - <base.image.name>onap/ccsdk-odl-aluminum-alpine-image</base.image.name> + <base.image.name>onap/ccsdk-odl-silicon-alpine-image</base.image.name> <image.name>onap/ccsdk-odlsli-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> @@ -33,12 +31,14 @@ <opendaylight.root>opt/opendaylight</opendaylight.root> <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> - <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra> + <odl.features.extra> + odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040 + </odl.features.extra> <ccsdk.odl.features> - ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all + ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all </ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - <!-- Version definition is placed in org.onap.ccsdk.parent/oparent --> + <!-- All Version definition is placed in org.onap.ccsdk.parent/oparent --> <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version> <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks> </properties> @@ -51,193 +51,192 @@ <type>zip</type> <classifier>repo</classifier> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>slicore-features-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ansible-adaptor-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-http-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>resource-assignment-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>saltstack-adaptor-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sliadaptors-features-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-features-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-features-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> + <version>${ccsdk.sli.version}</version> <type>zip</type> <classifier>repo</classifier> </dependency> @@ -332,7 +331,8 @@ <id>copy-dockerfile</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -351,7 +351,8 @@ <id>copy-scripts</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory> @@ -370,7 +371,8 @@ <id>copy-odl-resources</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -392,7 +394,8 @@ <id>copy-config</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -411,7 +414,8 @@ <id>copy-data</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory> @@ -430,7 +434,8 @@ <id>copy-properties</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties @@ -451,7 +456,8 @@ <id>copy-keystores</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory> @@ -523,35 +529,6 @@ </execution> </executions> </plugin> - <!-- - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> - <executions> - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> @@ -695,7 +672,7 @@ </ports> <wait> <log>all warp coils are now operating at peak efficiency</log> - <time>150000</time> + <time>300000</time> </wait> <log> <enabled>true</enabled> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index dd96594c..fccf7f74 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -15,10 +15,10 @@ COPY opt /opt COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg # CCSDK SLI -ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features -ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.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 CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features +ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features +ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features +ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features # CCSDK Features ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features |