summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-05-07 15:20:42 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-05-07 23:54:17 +0000
commitf2723a4f817346032f60f285692da221e7de8124 (patch)
treebdf08869390bc46afef67432e668bcb23ebb6e37
parentda0d726e12c4e77608b34a31f93f4197442dcc77 (diff)
Move Dmaven.test.skip param (s-u)
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: I7fd34114a45b0b36158e05a1be09ebc4d861d96e Issue-ID: CIMAN-159 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml3
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--jjb/so/so.yaml1
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml3
-rw-r--r--jjb/usecaseui/usecase-ui.yaml3
5 files changed, 8 insertions, 4 deletions
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 04a0c2d8f..35ee0a7a8 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.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: 'sdc/sdc-workflow-designer'
stream:
- 'master':
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 476707f86..471520425 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -11,7 +11,7 @@
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
-
+ mvn-params: '-Dmaven.test.skip=true'
project: 'sdnc/oam'
stream:
- 'master':
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 3e8efc7ab..99db60f8e 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -19,6 +19,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'so'
stream:
- 'master':
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index c0bb0f325..86df049f5 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -13,7 +13,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'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 42903955e..6854d8791 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -13,7 +13,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'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'