From: Tomasz Golabek <tomasz.golabek@nokia.com>
Date: Wed, 7 Aug 2019 09:02:42 +0000 (+0200)
Subject: Pnfsimulator-docker push configuration
X-Git-Tag: 6.0.0-ONAP~409
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F92863%2F1;p=integration.git

Pnfsimulator-docker push configuration

New configuration for pnfsimulator and netconfsimulator added for docker builds.
Version of maven docker plugin downgraded to 1.0.0
Single tag added to images

Change-Id: Ia0e38b2c65e943614c7463d7889a7ca0b1aa0517
Issue-ID: INT-1134
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
---

diff --git a/test/mocks/pnfsimulator/netconfsimulator/pom.xml b/test/mocks/pnfsimulator/netconfsimulator/pom.xml
index 7c8d5c78e..d83c5b397 100644
--- a/test/mocks/pnfsimulator/netconfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/netconfsimulator/pom.xml
@@ -242,16 +242,14 @@
       <plugin>
         <groupId>com.spotify</groupId>
         <artifactId>docker-maven-plugin</artifactId>
-        <version>1.1.1</version>
+        <version>1.0.0</version>
         <configuration>
           <imageName>${docker.registry}/${docker.image.name}</imageName>
           <dockerDirectory>${project.basedir}/docker</dockerDirectory>
           <forceTags>true</forceTags>
           <registryUrl>${docker.registry}</registryUrl>
           <imageTags>
-            <tag>latest</tag>
-            <tag>${project.version}</tag>
-            <tag>${project.version}-${maven.build.timestamp}</tag>
+            <imageTag>latest</imageTag>
           </imageTags>
           <resources>
             <resource>
diff --git a/test/mocks/pnfsimulator/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pnfsimulator/pom.xml
index 01d68ddc0..83aa3f051 100644
--- a/test/mocks/pnfsimulator/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pnfsimulator/pom.xml
@@ -310,16 +310,14 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.1.1</version>
+                <version>1.0.0</version>
                 <configuration>
                     <registryUrl>${onap.nexus.dockerregistry.daily}</registryUrl>
                     <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>
                     <dockerDirectory>${project.basedir}/docker</dockerDirectory>
                     <forceTags>true</forceTags>
                     <imageTags>
-                        <tag>latest</tag>
-                        <tag>${project.version}</tag>
-                        <tag>${project.version}-${maven.build.timestamp}</tag>
+                        <imageTag>latest</imageTag>
                     </imageTags>
 
                     <resources>