summaryrefslogtreecommitdiffstats
path: root/installation/ansible-server
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-14 16:38:27 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-14 16:38:27 -0500
commitd4b1b9d27f4dd0563a1a1f7c25cb0ff92f2ccc0a (patch)
treecaf63c020cf329c6244c33ca2f3a8fe27242e16e /installation/ansible-server
parentb1e839a6b6e5ef00a48b9525317736a917e8c287 (diff)
Fix docker tags
Fix docker image tags to conform to ONAP standards Change-Id: Id85ab45a3b5a99f215f42177640ed03ab39004bc Issue-ID: SDNC-645 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Former-commit-id: 5eadcba086124f49b7cdcc53db4b4622dc2ebd93
Diffstat (limited to 'installation/ansible-server')
-rw-r--r--installation/ansible-server/pom.xml28
1 files changed, 8 insertions, 20 deletions
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 3c22fd7a..c8876ceb 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -1,5 +1,7 @@
<?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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
@@ -18,6 +20,7 @@
<properties>
<image.name>onap/sdnc-ansible-server-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
+ <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
<ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
@@ -36,22 +39,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- println project.properties['sdnc.project.version'];
- def versionArray;
- if ( project.properties['sdnc.project.version'] != null ) {
- versionArray = project.properties['sdnc.project.version'].split('\\.');
- }
-
- if (project.properties['sdnc.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'];
- </source>
+ <source>${basedir}/../TagVersion.groovy</source>
</configuration>
</execution>
</executions>
@@ -104,9 +92,9 @@
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
- <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
- <tag>${project.docker.latesttag.version}</tag>
+ <tag>${project.docker.latestminortag.version}</tag>
+ <tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
</tags>
</build>
</image>