diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2018-03-28 21:01:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-28 21:01:01 +0000 |
| commit | b8eee1aa1e758036a9104308d5607a47cc4836c9 (patch) | |
| tree | baa0d46c82515206827f0031b000e6c0fad5616e | |
| parent | bf6b7a79058c6eb961a34c4a461d8b788ea55e79 (diff) | |
| parent | d25908c3ae07e994ef6630b776a69abfda951b0c (diff) | |
Merge "Add mvn-params to verify-java"
| -rw-r--r-- | jjb/global-defaults.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 8 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 51cf6c6dd..450355ff2 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -25,6 +25,7 @@ jdk: '' # Maven + mvn-params: '' onap-infra-mvn-opts: | --show-version --batch-mode diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 6be0e0f94..27167b67e 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -123,6 +123,14 @@ description: 'Used by Heat to generate a unique stack & vm name' - parameter: + name: maven-params + parameters: + - string: + name: MAVEN_PARAMS + default: '{mvn-params}' + description: Maven parameters to pass to the mvn command. + +- parameter: name: maven-exec parameters: - string: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 210ed9b82..171fdb191 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -90,6 +90,8 @@ artifacts: '{archive-artifacts}' - maven-exec: maven-version: '{maven-version}' + - maven-params: + mvn-params: '{mvn-params}' scm: - gerrit-trigger-scm: @@ -115,7 +117,7 @@ - maven-target: maven-version: '{maven-version}' goals: 'clean install -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' |