summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Migdal <marcin.migdal@nokia.com>2018-08-13 11:27:19 +0200
committerMarcin Migdal <marcin.migdal@nokia.com>2018-08-13 12:34:33 +0200
commit9c6d8f3a16ac8064ab3a91636ac51bfd7f718f9e (patch)
tree2be2ba3c62c019109286f45bd90caa7a48d05b8f
parent86fc2ff5ef3776b9d25a9bfe026a69de9c2ac4a6 (diff)
Preparing for INT-607
Fixed build final commit Change-Id: I984e1fbafbb84bb1d65865baabf933d215eae6e1 Issue-ID: INT-607 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
-rw-r--r--test/mocks/pnfsimulator/pom.xml97
1 files changed, 1 insertions, 96 deletions
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>