From: Patrick Brady <pb071s@att.com>
Date: Fri, 28 Apr 2017 06:58:13 +0000 (-0700)
Subject: Change docker tagging
X-Git-Tag: v1.2.0~87
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c9dca11d2a9888d8fcfd0f04a5ba62b3fa55d641;p=appc%2Fdeployment.git

Change docker tagging

Add script to check if a snapshot or release is being built.
Create the appropriate docker tags for each case.

Change-Id: Iac3e1804222a4ce838a3fb8a2130036ec0cda40d
Signed-off-by: Patrick Brady <pb071s@att.com>
---

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index db1cb67..3982e23 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -191,6 +191,40 @@
 			<id>docker</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.codehaus.groovy.maven</groupId>
+						<artifactId>gmaven-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>validate</phase>
+								<goals>
+									<goal>execute</goal>
+								</goals>
+								<configuration>
+									<properties>
+										<ver>${project.version}</ver>
+										<timestamp>${maven.build.timestamp}</timestamp>
+									</properties>
+									<source>
+										println project.properties['ver'];
+										def versionArray;
+										if ( project.properties['ver'] != null ) {
+										versionArray = project.properties['ver'].split('\\.');
+										}
+										if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+										project.properties['dockertag1']=project.properties['ver'] + "-latest";
+										project.properties['dockertag2']="latest";
+										} else {
+										project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+										project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+										}
+										println 'docker tag 1: ' + project.properties['dockertag1'];
+										println 'docker tag 2: ' + project.properties['dockertag2'];
+									</source>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
@@ -205,8 +239,8 @@
 										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
 										<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
 										<tags>
-											<tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag>
-											<tag>${release_name}.${sprint_number}-STAGING-latest</tag>
+											<tag>${dockertag1}</tag>
+											<tag>${dockertag2}</tag>
 										</tags>
 									</build>
 								</image>