summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2018-08-16 08:09:27 +0200
committerPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2018-08-16 09:52:12 +0200
commit45613ffdf0de0794267bf8eb4ecb86c6b813eff1 (patch)
tree069e6691cfa71496170cc8e2762ac53ca76a0b19
parent8a2552ac94981cfa18cce551066d9ca4ec668558 (diff)
Align with release docker & JARs CI definitions
If not explocitly called with -DskipDockerPush=false Maven will not push docker images to the registry. The change is introduced in order for '{project-name}-{stream}-docker-java-shell-daily' to do the push but all other Jenkins jobs should skip this step. Also set hv-collector-analysis version to 1.0.0-SNAPSHOT as it's not a child of root pom (it contains only custom definitions needed for detekt plugin to work). Change-Id: Icc4a1d6cc1a763fad417860b45ffdad30524f67b Issue-ID: DCAEGEN2-661 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
-rw-r--r--pom.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 7504d4f2..127e4bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<!-- Docker -->
<skipDocker>false</skipDocker>
+ <skipDockerPush>true</skipDockerPush>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
<docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
<docker-image.namespace>onap</docker-image.namespace>
@@ -89,7 +90,6 @@
<docker.http_proxy></docker.http_proxy>
</properties>
-
<build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
@@ -338,7 +338,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hv-collector-analysis</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -420,6 +420,7 @@
</execution>
</executions>
<configuration>
+ <skipPush>${skipDockerPush}</skipPush>
<verbose>true</verbose>
<imagePullPolicy>IfNotPresent</imagePullPolicy>
<images>