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

Preparing for INT-607
Fixed build final commit

Change-Id: I984e1fbafbb84bb1d65865baabf933d215eae6e1
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 e68ca8b2f..2803402f7 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -240,10 +240,8 @@
         <version>1.0.0</version>
         <configuration>
           <registryUrl>${onap.nexus.dockerregistry.daily}</registryUrl>
-          <!--
-          <serverId>${onap.nexus.dockerregistry.daily}</serverId>
-          -->
           <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>
+          <forceTags>true</forceTags>
           <imageTags>
             <tag>latest</tag>
             <tag>${project.version}</tag>
@@ -264,99 +262,6 @@
           </resources>
           <forceTags>true</forceTags>
         </configuration>
-        <!--
-        <executions>
-          <execution>
-            <id>build-image</id>
-            <phase>package</phase>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>tag-image-latest</id>
-            <phase>package</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <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>
-            <id>tag-image-with-version</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>
-            </configuration>
-          </execution>
-          <execution>
-            <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}-${maven.build.timestamp}</newName>
-            </configuration>
-          </execution>
-          -->
-          <!-- testing pushing default imgae-->
-        <!--
-          <execution>
-            <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}:latest</imageName>
-            </configuration>
-          </execution>
-          <execution>
-            <id>push-image-with-version</id>
-            <phase>none</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</imageName>
-            </configuration>
-          </execution>
-          <execution>
-            <id>push-image-with-version-and-date</id>
-            <phase>none</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</imageName>
-            </configuration>
-          </execution>
-        </executions>
-        -->
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>