Changing docker image tag

Issue-ID: INT-458

Change-Id: I1860841fd3b0eecb79b0991ed084a7dc61e85703
Signed-off-by: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index 040f370..f607424 100644 (file)
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.onap.pnfsimulator</groupId>
   <artifactId>pnf-simulator</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
 
   <name>pnf-simulator</name>
 
@@ -15,7 +15,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class>
-        <docker.image.tag>latest</docker.image.tag>
+        <docker.image.tag.latest>latest</docker.image.tag.latest>
         <dependency.directory.name>libs</dependency.directory.name>
         <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location>
         <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
@@ -122,7 +122,8 @@
               <version>1.0.0</version>
               <configuration>
                   <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.artifactId}</imageName>
-                  <imageTags>${docker.image.tag}</imageTags>
+                  <imageTags>latest</imageTags>
+                  <imageTags>${project.version}-latest</imageTags>
                   <serverId>${onap.nexus.dockerregistry.daily}</serverId>
                   <baseImage>openjdk:8-jdk-alpine</baseImage>
                   <cmd>java -cp  ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}</cmd>

diff --git a/test/mocks/pnfsimulator/simulator.sh b/test/mocks/pnfsimulator/simulator.sh
index 5e8b2d5..ff3c07c 100755 (executable)
--- a/test/mocks/pnfsimulator/simulator.sh
+++ b/test/mocks/pnfsimulator/simulator.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 CONTAINER_NAME=pnf-simulator
 CONFIG_FILE_PATH=/config/body.json
 SIMULATOR_DOCKER_HUB=nexus3.onap.org:10003/onap
-SIMULATOR_TAG=latest
+SIMULATOR_TAG=1.1.0-SNAPSHOT-latest
 
 function main(){