From 806ab87c5aadfba18f4f908a535db84614dc0146 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 7 May 2018 15:13:16 -0700 Subject: [PATCH] Move Dmaven.test.skip param (a-e) Rather than hardcoding this parameter as part of the maven-docker-push-daily macro, we are passing it as a "mvn-params" parameter from the project's JJB template. Notice that this change IS NOT adding "Dmaven.test.skip=true" but rather moving it away from the macro into the project's template to handle it individually per project. Please refer to commit 262e8694ebce04450bc29b4805088a354b8aaccb Change-Id: I0f2e0d681734939f4e9b7d07faca33cc4a0da2b9 Issue-ID: CIMAN-159 Signed-off-by: Jessica Wagantall --- jjb/aai/aai-esr-gui.yaml | 3 ++- jjb/aai/aai-esr-server.yaml | 3 ++- jjb/aai/aai-resources.yaml | 1 + jjb/aai/aai-traversal.yaml | 1 + jjb/appc/appc-deployment.yaml | 6 ++++-- jjb/ccsdk/distribution.yaml | 6 ++++-- jjb/clamp/clamp.yaml | 1 + jjb/dmaap/dmaap-messagerouter-docker.yaml | 6 ++++-- jjb/externalapi/externalapi-nbi.yaml | 1 + 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 335c2756e..ccc77bec8 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -7,7 +7,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' project: 'aai/esr-gui' stream: diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index a55501797..624caefd8 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -7,7 +7,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' project: 'aai/esr-server' stream: diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 3e12ba602..1480c555a 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -10,6 +10,7 @@ - '{project-name}-{stream}-docker-java-daily': docker-pom: 'aai-resources/pom.xml' mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: 'aai/resources' stream: - 'master': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 8726ad481..bfc73a396 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -10,6 +10,7 @@ - '{project-name}-{stream}-docker-java-daily': docker-pom: 'aai-traversal/pom.xml' mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: 'aai/traversal' stream: - 'master': diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c3f9edcc8..5d23d5315 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -8,8 +8,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-docker-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-{stream}-docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' - '{project-name}-docker-image-blessing' project: 'appc/deployment' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 5072b999c..a11353e49 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -7,8 +7,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-docker-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-{stream}-docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' project: 'ccsdk/distribution' stream: diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index b289b70af..6d775ebc0 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -23,6 +23,7 @@ setVersion: 'DoSetVersion' docker-pom: 'pom.xml' mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' maven-properties: | skip.docker.build=false skip.docker.tag=false diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 22f043e9d..c00ffc262 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -8,8 +8,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-docker-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-{stream}-docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 592a886ad..b1884031c 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -10,6 +10,7 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: 'externalapi/nbi' stream: - 'master': -- 2.16.6