X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=3973349c6770057b173a68e14eae20c6bdee391d;hb=refs%2Fheads%2Fmaster;hp=00b58973e16dd2caed6ac257cbe67d21070fe0ff;hpb=1f4e903277d4f94db0bed99245026b82fa36fba3;p=ccsdk%2Fdistribution.git
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 00b58973..3973349c 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,12 +5,10 @@
org.onap.ccsdk.distribution
distribution-odlsli
- 1.1.1-SNAPSHOT
+ 1.6.1-SNAPSHOT
- org.onap.ccsdk.distribution
distribution-odlsli-alpine
- 1.1.1-SNAPSHOT
pom
ccsdk-distribution :: odlsli-alpine
@@ -20,7 +18,7 @@
- onap/ccsdk-odl-aluminum-alpine-image
+ onap/ccsdk-odl-argon-alpine-image
onap/ccsdk-odlsli-alpine-image
${project.version}
@@ -33,17 +31,21 @@
opt/opendaylight
93C4A3FD7BB9C367
- odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040
-
- 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}
- 1.1.1-SNAPSHOT
- 1.2.0-SNAPSHOT
- 1.2.0-SNAPSHOT
- 1.2.0-SNAPSHOT
- 1.2.0-SNAPSHOT
- 1.1.1-SNAPSHOT
+
+
+ odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040,odl-restconf-nb-bierman02,odl-controller-blueprint
+
+
+
+ ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all
+
+
+
+ mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${resolvedVersion.slicore-features-installer}/xml/features,\
+ mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${resolvedVersion.sliadaptors-features-installer}/xml/features,\
+ mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${resolvedVersion.slinorthbound-features-installer}/xml/features,\
+ mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${resolvedVersion.sliplugins-features-installer}/xml/features
+
true
@@ -55,256 +57,192 @@
zip
repo
-
org.onap.ccsdk.sli.core
dblib-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.core
filters-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.core
sli-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.core
sliapi-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.core
sliPluginUtils-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.core
utils-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.core
slicore-features-installer
- ${ccsdk.sli.core.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
aai-service-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
- ansible-adapter-installer
- ${ccsdk.sli.adaptors.version}
+ ansible-adaptor-installer
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
base-http-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
mdsal-resource-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors.messagerouter
publisher.installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
netbox-client-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
resource-assignment-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
- saltstack-adapter-installer
- ${ccsdk.sli.adaptors.version}
+ saltstack-adaptor-installer
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
sql-resource-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.adaptors
sliadaptors-features-installer
- ${ccsdk.sli.adaptors.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.northbound
asdcApi-installer
- ${ccsdk.sli.northbound.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.northbound
dataChange-installer
- ${ccsdk.sli.northbound.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.northbound
lcm-installer
- ${ccsdk.sli.northbound.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.northbound
slinorthbound-features-installer
- ${ccsdk.sli.northbound.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.plugins
properties-node-installer
- ${ccsdk.sli.plugins.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.plugins
restapi-call-node-installer
- ${ccsdk.sli.plugins.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.plugins
template-node-installer
- ${ccsdk.sli.plugins.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.plugins
restconf-client-installer
- ${ccsdk.sli.plugins.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.plugins
sshapi-call-node-installer
- ${ccsdk.sli.plugins.version}
+ ${ccsdk.sli.version}
zip
repo
org.onap.ccsdk.sli.plugins
sliplugins-features-installer
- ${ccsdk.sli.plugins.version}
- zip
- repo
-
-
- org.onap.ccsdk.features
- features-installer
- ${ccsdk.features.version}
- zip
- repo
-
-
- org.onap.ccsdk.features.sdnr.wt
- sdnr-wt-feature-aggregator-installer
- ${ccsdk.features.version}
- zip
- repo
-
-
- org.onap.ccsdk.features
- aafshiro-installer
- ${ccsdk.features.version}
- zip
- repo
-
-
- org.onap.ccsdk.features.sdnr.northbound
- sdnr-northbound-features-installer
- ${ccsdk.features.version}
- zip
- repo
-
-
- org.onap.ccsdk.oran
- a1-adapter-northbound-installer
- ${ccsdk.oran.a1adapter.version}
- zip
- repo
-
-
- org.onap.ccsdk.features.sdnr.northbound
- oofpcipoc-installer
- ${ccsdk.features.version}
- zip
- repo
-
-
- org.onap.ccsdk.oran
- a1-adapter-installer
- ${ccsdk.oran.a1adapter.version}
- zip
- repo
-
-
- org.onap.ccsdk.features.sdnr.northbound
- CMNotify-installer
- ${ccsdk.features.version}
- zip
- repo
-
-
- org.onap.ccsdk.features.sdnr.northbound
- ranSlice-installer
- ${ccsdk.features.version}
+ ${ccsdk.sli.version}
zip
repo
@@ -312,12 +250,24 @@
+
- org.codehaus.groovy.maven
- gmaven-plugin
- 1.0
+ org.codehaus.gmaven
+ groovy-maven-plugin
+ 2.1.1
+ derive-resolved-versions
+ initialize
+
+ execute
+
+
+
+
+
+
+ derive-docker-tags
validate
execute
@@ -336,7 +286,8 @@
copy-dockerfile
copy-resources
-
+
+
validate
${basedir}/target/docker-stage
@@ -355,7 +306,8 @@
copy-scripts
copy-resources
-
+
+
validate
${basedir}/target/docker-stage/opt/onap/ccsdk/bin
@@ -374,7 +326,8 @@
copy-odl-resources
copy-resources
-
+
+
validate
${basedir}/target/docker-stage
@@ -396,7 +349,8 @@
copy-config
copy-resources
-
+
+
validate
${basedir}/target/docker-stage
@@ -415,7 +369,8 @@
copy-data
copy-resources
-
+
+
validate
${basedir}/target/docker-stage/opt/onap/ccsdk/data
@@ -434,7 +389,8 @@
copy-properties
copy-resources
-
+
+
validate
${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties
@@ -455,7 +411,8 @@
copy-keystores
copy-resources
-
+
+
validate
${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores
@@ -509,29 +466,21 @@
- org.codehaus.mojo
- exec-maven-plugin
- 1.5.0
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.8
- change shell permissions
+ change-shell-permissions
process-sources
-
- exec
-
- /usr/bin/find
-
- ${basedir}/target/docker-stage/opt/onap/ccsdk
- -name
- *.sh
- -exec
- chmod
- +x
- {}
- ;
-
+
+
+
+
+ run
+
@@ -594,6 +543,7 @@
${image.name}
try
+ true
${basedir}/target/docker-stage
Dockerfile
@@ -609,91 +559,9 @@
- build-images
- package
+ build-push-images
build
-
-
-
- start-it-instance
- pre-integration-test
-
- start
-
-
-
-
- mariadb:10.5
- odlsli-db
-
-
- itsASecret
- sdnctl
- gamma
- sdnctl
-
-
- custom
- onap
- dbhost
- sdnctldb01
- sdnctldb02
-
-
- odlslidb.port:3306
-
-
- true
-
-
-
-
- ${image.name}:${project.docker.latesttagtimestamp.snapshot.version}
- odlsli-container
-
-
- itsASecret
- sdnctl
- gamma
- sdnctl
- /opt/onap/ccsdk/data/properties
- INFO
-
-
- odlsli-db
-
-
- custom
- onap
- odlsli
-
-
- odlsli.port:8181
-
-
- all warp coils are now operating at peak efficiency
-
-
-
- true
-
-
-
-
-
-
-
- stop-it-instance
- post-integration-test
-
- stop
-
-
-
- push-images
-
-
push