diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-defaults.yaml | 2 | ||||
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 14 | ||||
| -rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 8 | ||||
| -rw-r--r-- | jjb/vpp/vpp-lite.yaml | 2 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 8 |
5 files changed, 16 insertions, 18 deletions
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 192163d76..96946b419 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -12,5 +12,3 @@ ssh-credentials: 'jenkins-gerrit-credentials' - # Maven versions - mvn33: 'Maven_3.3.9' 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 diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 7cb2fc938..f81246221 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -67,7 +67,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'nsh_sfc-settings' settings-type: cfp @@ -146,7 +146,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'nsh_sfc-settings' settings-type: cfp @@ -328,7 +328,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -400,7 +400,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml index 786ec204d..49d807cc4 100644 --- a/jjb/vpp/vpp-lite.yaml +++ b/jjb/vpp/vpp-lite.yaml @@ -149,7 +149,7 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 36b97a66c..85382ade6 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -190,7 +190,7 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' @@ -219,7 +219,7 @@ - shell: !include-raw-escape: include-raw-vpp-build.sh - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -404,7 +404,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -481,7 +481,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp |