From: Marcin Migdal <marcin.migdal@nokia.com>
Date: Thu, 9 Aug 2018 13:22:37 +0000 (+0200)
Subject: Preparing for INT-607
X-Git-Tag: 3.0.0~356
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5d08958636a11ec9d570a995f09fa09f6e14de49;p=integration.git

Preparing for INT-607
Attempt to fix build part3

Change-Id: I7a0d6d05aed920e21e3bfd5b78bdffc271630192
Issue-ID: INT-607
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
---

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index bbb91ea8e..18e8163bc 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -282,45 +282,58 @@
             </configuration>
           </execution>
           <execution>
-            <id>push-image-latest</id>
-            <phase>none</phase>
+            <id>tag-image-with-version</id>
+            <phase>package</phase>
             <goals>
-              <goal>push</goal>
+              <goal>tag</goal>
             </goals>
             <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName>
+              <image>${docker.image.name}:latest</image>
+              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
             </configuration>
           </execution>
           <execution>
-            <id>tag-image-with-version</id>
+            <id>tag-image-with-version-and-date</id>
             <phase>package</phase>
             <goals>
               <goal>tag</goal>
             </goals>
             <configuration>
               <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
+              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
             </configuration>
           </execution>
+
+          <!-- testing pushing default imgae-->
           <execution>
-            <id>push-image-with-version</id>
+            <id>default</id>
+            <goals>
+              <goal>push</goal>
+            </goals>
+            <configuration>
+              <registryUrl>${onap.nexus.dockerregistry.daily}</registryUrl>
+              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>push-image-latest</id>
             <phase>none</phase>
             <goals>
               <goal>push</goal>
             </goals>
             <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</imageName>
+              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName>
             </configuration>
           </execution>
           <execution>
-            <id>tag-image-with-version-and-date</id>
-            <phase>package</phase>
+            <id>push-image-with-version</id>
+            <phase>none</phase>
             <goals>
-              <goal>tag</goal>
+              <goal>push</goal>
             </goals>
             <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
+              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</imageName>
             </configuration>
           </execution>
           <execution>