X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fodlsli-ubuntu%2Fpom.xml;h=8b26b49001cf9be3e9f2bec931471f37bd2ff61f;hp=93d527b9e70155c937ab3de200d05f82a9853102;hb=268c4ba118679fa90b973ac49660d8f83eb9575b;hpb=e7cfae5dc0eb888487c6988678bcc99b2dad04c1 diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 93d527b9..8b26b490 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -24,6 +24,7 @@ onap/ccsdk-odl-fluorine-ubuntu-image onap/ccsdk-odlsli-image ${project.version} + ${maven.build.timestamp} ${project.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -31,6 +32,9 @@ deploy true 93C4A3FD7BB9C367 + odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all + 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} @@ -112,6 +116,13 @@ repo zip + + org.onap.ccsdk.sli.adaptors + netbox-client-installer + ${ccsdk.sli.adaptors.version} + repo + zip + org.onap.ccsdk.sli.adaptors resource-assignment-installer @@ -121,7 +132,7 @@ org.onap.ccsdk.sli.adaptors - netbox-client-installer + saltstack-adapter-installer ${ccsdk.sli.adaptors.version} repo zip @@ -248,22 +259,7 @@ execute - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - + ${basedir}/../../src/main/scripts/TagVersion.groovy @@ -503,9 +499,9 @@ ${basedir}/target/docker-stage ${basedir}/target/docker-stage/Dockerfile - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version}