summaryrefslogtreecommitdiffstats
path: root/odlsli
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-12-10 15:03:26 +0000
committerGerrit Code Review <gerrit@onap.org>2020-12-10 15:03:26 +0000
commita79c328f0fdf4ec9b2125a4b3df8192da3247f32 (patch)
tree822cf5d92ea05e7554e22708f25949ea0e07091b /odlsli
parent692718d5aca13ede537d44a89aafcb33bc80257a (diff)
parent0c4500afd225801c940b309a2615b1afe3c505c8 (diff)
Merge "Move CSIT to ccsdk/distribution repo"
Diffstat (limited to 'odlsli')
-rw-r--r--odlsli/odlsli-alpine/pom.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index b78ece27..69a5b920 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -24,7 +24,8 @@
<base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
- <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+ <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+ <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<opendaylight.root>opt/opendaylight</opendaylight.root>
@@ -45,7 +46,7 @@
<ccsdk.sli.plugins.version>1.1.0</ccsdk.sli.plugins.version>
<ccsdk.oran.a1adapter.version>1.1.0</ccsdk.oran.a1adapter.version>
<docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
- </properties>
+</properties>
<dependencies>
<dependency>
@@ -333,7 +334,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
+ <source>${basedir}/../../src/main/scripts/TagSnapshotVersion.groovy</source>
</configuration>
</execution>
</executions>
@@ -608,7 +609,8 @@
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
<tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
+ <tag>${project.docker.uniquedockertag.version}</tag>
+ </tags>
</build>
</image>
</images>