Adding tagging to our staging images

Tags will look like :
 version-STAGING-commitId

 If no 'mso.git.commit' passed, last part will be blank

Change-Id: I4ba4dc1c6f292e8f1f4d2d0470678712546796e4
Signed-off-by: JulienBe <jb379x@att.com>

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 6ca79b7..4bad970 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -109,7 +109,9 @@
                                                        <name>openecomp/mso-arquillian:%l</name>
                                                        <alias>mso-arquillian</alias>
                                                        <build>
-
+                                                               <tags>
+                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                                               </tags>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
                                                                <dockerFile>docker-files/Dockerfile.mso-arquillian</dockerFile>
@@ -120,7 +122,9 @@
                                                        <name>openecomp/mso:%l</name>
                                                        <alias>mso</alias>
                                                        <build>
-
+                                                               <tags>
+                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                                               </tags>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
                                                                <dockerFile>docker-files/Dockerfile.mso-chef-final</dockerFile>

diff --git a/pom.xml b/pom.xml
index 155debb..348a233 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
                <nexusproxy>https://nexus.openecomp.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
        </properties>
        <distributionManagement>
                <repository>