Spotify plugin config change

Changed docker images name to include nexus3 repo so that images get pushed correctly

Change-Id: Ibed31d0933d56e12d26fab1c795d05d79f04406d
Issue-ID: DCAEGEN2-338
Signed-off-by: amshegokar <AS00500801@techmahindra.com>

diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index d500eaf..71a13c3 100644 (file)
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -42,8 +42,8 @@
                <snapshots.path>content/repositories/snapshots/</snapshots.path>
                <releases.path>content/repositories/releases/</releases.path>
                <site.path>
-                       content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}
-               </site.path>
+            content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}
+        </site.path>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
 
        </properties>
@@ -244,9 +244,11 @@
                                <version>1.1.1</version>
                                <configuration>
                                        <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}-${maven.build.timestamp}Z</tag>
+                                               <tag>${project.version}</tag>
                                        </imageTags>
                                        <baseImage>ubuntu:16.04</baseImage>
                                        <env>
@@ -272,7 +274,7 @@
                                        <entryPoint>bin/run.sh</entryPoint>
 
                                </configuration>
-                               <executions>
+                               <!--<executions>
                                        <execution>
                                                <id>build-image</id>
                                                <phase>package</phase>
@@ -319,7 +321,7 @@
                                                        <pushImage>true</pushImage>
                                                </configuration>
                                        </execution>
-                               </executions>
+                               </executions>-->
                        </plugin>
                        <plugin>
                                <groupId>org.springframework.boot</groupId>

diff --git a/snmpmapper/pom.xml b/snmpmapper/pom.xml
index b049c5f..bd6dfa4 100644 (file)
--- a/snmpmapper/pom.xml
+++ b/snmpmapper/pom.xml
@@ -47,7 +47,7 @@
         <snapshots.path>content/repositories/snapshots/</snapshots.path>
         <releases.path>content/repositories/releases/</releases.path>
         <site.path>
-            content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}
+            content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}
         </site.path>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
        </properties>
@@ -199,9 +199,11 @@
                 <version>1.1.1</version>
                 <configuration>
                     <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}-${maven.build.timestamp}Z</tag>
+                                               <tag>${project.version}</tag>
                     </imageTags>
                     <baseImage>ubuntu:16.04</baseImage>
                     <env>
@@ -228,7 +230,7 @@
                     <entryPoint>bin/run.sh</entryPoint>
  
                 </configuration>
-                <executions>
+                <!--<executions>
                     <execution>
                         <id>build-image</id>
                         <phase>package</phase>
@@ -275,7 +277,7 @@
                             <pushImage>true</pushImage>
                         </configuration>
                     </execution>
-                </executions>
+                </executions>-->
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>