diff options
| author |   Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-10-14 00:26:21 -0400 |
|---|---|---|
| committer | Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-10-14 00:27:03 -0400 |
| commit | 4395e4a78efe5318f660394671c53d12a4d1d692 (patch) | |
| tree | 8c997c6c9b8932cda2f3bb2179edc938bb0b5fdc /jjb/honeycomb | |
| parent | 500359cbb470de6bd6686f30980a1d7ff567f3d0 (diff) | |
Remove the need for mvn33 defaults
Instead of indirectly calling {mvn33} in jjb and redirecting it to
Maven_3.3.9 in Jenkins. Simply name Maven in Jenkins mvn33 and then
jobs can call mvn33 directly without the need for the defaults
redirection.
The new mvn33 profile has already been created in fd.io Jenkins.
Change-Id: I792509ab2d80546a532930f1f579afb69bfc670c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Diffstat (limited to 'jjb/honeycomb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index d0883365a..beaacc29f 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -63,7 +63,7 @@ - shell: | if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true site' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -131,7 +131,7 @@ - shell: | if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -162,7 +162,7 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' @@ -185,7 +185,7 @@ branch: '{branch}' maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -222,7 +222,7 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' @@ -249,7 +249,7 @@ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -260,7 +260,7 @@ postbuilders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'honeycomb-settings' settings-type: cfp |