From 4395e4a78efe5318f660394671c53d12a4d1d692 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 14 Oct 2016 00:26:21 -0400 Subject: 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 --- jjb/vpp/vpp-lite.yaml | 2 +- jjb/vpp/vpp.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'jjb/vpp') 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 -- cgit 1.2.3-korg