From: efiacor <fiachra.corcoran@est.tech>
Date: Thu, 17 Oct 2019 21:28:22 +0000 (+0100)
Subject: Stop tagging latest on old branch
X-Git-Tag: 2.2.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6fdf968c47a734b5f75a766d09581e592f90d3fa;p=dmaap%2Fdatarouter.git

Stop tagging latest on old branch

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4600f438db2ca9eb4848f548673dd926059f2a3c
Issue-ID: INT-1337
---

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 6ebfd967..a94c9288 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -157,13 +157,12 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>${datarouter.node.image.name}</name>
+                                    <name>${datarouter.node.image.name}:${dockertag1}</name>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${dockertag1}</tag>
                                             <tag>${dockertag2}</tag>
                                         </tags>
                                     </build>
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 92a1bf46..8ecf1b95 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -212,13 +212,12 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>${datarouter.prov.image.name}</name>
+                                    <name>${datarouter.prov.image.name}:${dockertag1}</name>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${dockertag1}</tag>
                                             <tag>${dockertag2}</tag>
                                         </tags>
                                     </build>
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index d7294a33..33c6cf45 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -109,13 +109,12 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>${datarouter.sub.image.name}</name>
+                                    <name>${datarouter.sub.image.name}:${dockertag1}</name>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${dockertag1}</tag>
                                             <tag>${dockertag2}</tag>
                                         </tags>
                                     </build>