diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-05-07 15:20:04 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-05-07 16:34:46 -0700 |
| commit | da0d726e12c4e77608b34a31f93f4197442dcc77 (patch) | |
| tree | 331683c9277989750bc53d3b8060461ac380f310 | |
| parent | 806ab87c5aadfba18f4f908a535db84614dc0146 (diff) | |
Move Dmaven.test.skip param (h-m)
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: I71a93ca778817448d7b8772fd32fd7cc87460d35
Issue-ID: CIMAN-159
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
| -rw-r--r-- | jjb/holmes/holmes-dsa.yaml | 3 | ||||
| -rw-r--r-- | jjb/holmes/holmes-engine-mgt.yaml | 3 | ||||
| -rw-r--r-- | jjb/holmes/holmes-rule-mgt.yaml | 3 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics.yaml | 1 | ||||
| -rw-r--r-- | jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml | 1 | ||||
| -rw-r--r-- | jjb/music/music.yaml | 1 |
6 files changed, 9 insertions, 3 deletions
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index a44a9e5f8..849b42985 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.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: 'holmes/dsa' stream: diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index db1eeeee6..e783a8ef7 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.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: 'holmes/engine-management' stream: diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 3b5638e52..5dcd1328f 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.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: 'holmes/rule-management' stream: diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 9fbcaef62..13180032a 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.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: 'logging-analytics' stream: - 'master': diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 40db4d120..53350d0af 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -23,6 +23,7 @@ setVersion: 'DontSetVersion' docker-pom: 'javatoscachecker/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/music/music.yaml b/jjb/music/music.yaml index 00b4d2fb1..b4b879d92 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.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: 'music' stream: - 'master': |