summaryrefslogtreecommitdiffstats
path: root/test/mocks
diff options
context:
space:
mode:
authorMarcin Migdal <marcin.migdal@nokia.com>2018-08-10 15:09:31 +0200
committerMarcin Migdal <marcin.migdal@nokia.com>2018-08-10 15:09:31 +0200
commit86fc2ff5ef3776b9d25a9bfe026a69de9c2ac4a6 (patch)
tree462c5e383096fdb55e63de40912e48b49747696c /test/mocks
parentd742e44f6feb4d2c87fe6c2b3d6283cb93c4ace6 (diff)
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>
Diffstat (limited to 'test/mocks')
-rw-r--r--test/mocks/pnfsimulator/pom.xml14
1 files changed, 12 insertions, 2 deletions
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>