From: Michael Hwang <mhwang@research.att.com>
Date: Mon, 18 Sep 2017 21:16:23 +0000 (-0400)
Subject: Remove the mapping of docker executions
X-Git-Tag: v1.0.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F13231%2F1;p=dcaegen2%2Fplatform%2Fservicechange-handler.git

Remove the mapping of docker executions

The corresponding jjb has been changed to explicitly call the docker
execution operations.

Change-Id: I119f2ad570ee0af28da9f81feb9f26c6ebb9dd7f
Issue-Id: DCAEGEN2-60
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---

diff --git a/pom.xml b/pom.xml
index 98f126f..fa7d6b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,9 +177,10 @@
                 <version>0.4.13</version>
                 <configuration>
                     <maintainer>Michael Hwang</maintainer>
-                    <imageName>${project.artifactId}</imageName>
+                    <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
                     <imageTags>
-                        <imageTag>${project.version}</imageTag>
+                        <imageTag>${project.version}-${maven.build.timestamp}</imageTag>
+                        <imageTag>latest</imageTag>
                     </imageTags>
                     <baseImage>java:8-jre</baseImage>
                     <entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "prod", "http://consul:8500/v1/kv/service-change-handler?raw=true"]</entryPoint>
@@ -192,39 +193,6 @@
                         </resource>
                     </resources>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>tag-image-timestamped-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${project.artifactId}</image>
-                            <newName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}:${project.version}-${maven.build.timestamp}</newName>
-                            <pushImage>true</pushImage>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>tag-image-latest-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${project.artifactId}</image>
-                            <newName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}:LATEST</newName>
-                            <pushImage>true</pushImage>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
 
         </plugins>