From 0f572ceb4f5341a30950f67cb2217dd9ed2eb65d Mon Sep 17 00:00:00 2001
From: ig6133 <ig6133@intl.att.com>
Date: Thu, 6 Apr 2017 10:48:50 +0300
Subject: Update docker tags configuration

Change-Id: I9cd35046d1fd369f8b1b31edfd11e74299854ef0
Signed-off-by: ig6133 <ig6133@intl.att.com>
---
 sdc-os-chef/pom.xml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 88bff4e778..99556d0cc1 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -13,6 +13,7 @@
 
 	<properties>
 		<docker.tag>${project.version}-SNAPSHOT-${maven.build.timestamp}</docker.tag>
+		<docker.latest.tag>${project.version}-SNAPSHOT-latest</docker.latest.tag>
 	</properties>
 
 	<build>
@@ -52,7 +53,8 @@
 		<profile>
 			<id>docker-staging</id>
 			<properties>
-				<docker.tag>${project.version}-STAGING</docker.tag>
+				<docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
+				<docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
 			</properties>
 		</profile>
 		<profile>
@@ -138,78 +140,84 @@
 
 								<!-- Build backend image -->
 								<image>
-									<name>openecomp/sdc-backend:%l</name>
+									<name>openecomp/sdc-backend</name>
 									<alias>sdc-backend</alias>
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${project.basedir}/sdc-backend</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
 										</tags>
 									</build>
 								</image>
 
 								<!-- Build frontend image -->
 								<image>
-									<name>openecomp/sdc-frontend:%l</name>
+									<name>openecomp/sdc-frontend</name>
 									<alias>sdc-frontend</alias>
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${project.basedir}/sdc-frontend</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
 										</tags>
 									</build>
 								</image>
 
 								<!-- Build elastic search image -->
 								<image>
-									<name>openecomp/sdc-elasticsearch:%l</name>
+									<name>openecomp/sdc-elasticsearch</name>
 									<alias>sdc-elasticsearch</alias>
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${project.basedir}/sdc-elasticsearch</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
 										</tags>
 									</build>
 								</image>
 
 								<!-- Build kibana image -->
 								<image>
-									<name>openecomp/sdc-kibana:%l</name>
+									<name>openecomp/sdc-kibana</name>
 									<alias>sdc-kibana</alias>
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${project.basedir}/sdc-kibana</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
 										</tags>
 									</build>
 								</image>
 
 								<!-- Build cassandra image -->
 								<image>
-									<name>openecomp/sdc-cassandra:%l</name>
+									<name>openecomp/sdc-cassandra</name>
 									<alias>sdc-cassandra</alias>
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${project.basedir}/sdc-cassandra</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
 										</tags>
 									</build>
 								</image>
 								
 								<!-- Build sanity image -->
 								<image>
-									<name>openecomp/sdc-sanity:%l</name>
+									<name>openecomp/sdc-sanity</name>
 									<alias>sdc-sanity</alias>
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${project.basedir}/sdc-sanity</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
 										</tags>
 									</build>
 								</image>
@@ -225,7 +233,7 @@
 								</goals>
 								<configuration>
 									<removeAll>true</removeAll>
-									<image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l,openecomp/sdc-sanity:%l</image>
+									<image>openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity</image>
 								</configuration>
 							</execution>
 
@@ -244,7 +252,7 @@
 									<goal>push</goal>
 								</goals>
 								<configuration>
-									<image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l,openecomp/sdc-sanity:%l</image>
+									<image>openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity</image>
 								</configuration>
 							</execution>
 						</executions>
-- 
cgit 1.2.3-korg