From: Marcin Migdal <marcin.migdal@nokia.com>
Date: Fri, 10 Aug 2018 13:09:31 +0000 (+0200)
Subject: Preparing for INT-607
X-Git-Tag: 3.0.0~350
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=86fc2ff5ef3776b9d25a9bfe026a69de9c2ac4a6;p=integration.git

Preparing for INT-607
Attempt to fix build part 5

Change-Id: Ie0b1f3ed2bc6e73dad2ff8ee10c65da4276829e9
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 18e8163bc..e68ca8b2f 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -240,10 +240,14 @@
         <version>1.0.0</version>
         <configuration>
           <registryUrl>${onap.nexus.dockerregistry.daily}</registryUrl>
+          <!--
           <serverId>${onap.nexus.dockerregistry.daily}</serverId>
-          <imageName>${docker.image.name}</imageName>
+          -->
+          <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>
           <imageTags>
             <tag>latest</tag>
+            <tag>${project.version}</tag>
+            <tag>${project.version}-${maven.build.timestamp}</tag>
           </imageTags>
           <baseImage>openjdk:8-jre-alpine</baseImage>
           <cmd>java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}</cmd>
@@ -258,7 +262,9 @@
               <include>${project.build.finalName}.jar</include>
             </resource>
           </resources>
+          <forceTags>true</forceTags>
         </configuration>
+        <!--
         <executions>
           <execution>
             <id>build-image</id>
@@ -276,9 +282,11 @@
             <configuration>
               <image>${docker.image.name}:latest</image>
               <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>
+              -->
               <!-- WA in case push does not work at second job - to remove
               <pushImage>true</pushImage>
               -->
+          <!--
             </configuration>
           </execution>
           <execution>
@@ -303,8 +311,9 @@
               <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
             </configuration>
           </execution>
-
+          -->
           <!-- testing pushing default imgae-->
+        <!--
           <execution>
             <id>default</id>
             <goals>
@@ -347,6 +356,7 @@
             </configuration>
           </execution>
         </executions>
+        -->
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>