From dffe5f70993a06bf64eab89ca485648a93f16b59 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 19 May 2016 18:04:10 -0400 Subject: Simplify cfp jjb configuration JJB 1.5.0 now allows CFP to use freeform IDs so lets use it to simplify the yaml configuration. Change-Id: Id64e772cb9fc1ed2f0deb11b6ba405f4ab43fe1e Signed-off-by: Thanh Ha --- jjb/vpp/vpp.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'jjb/vpp') diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index aba5a8a6a..fafd91667 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -190,11 +190,13 @@ - maven-target: maven-version: '{mvn33}' goals: '--version' - settings: '{vpp-settings}' - global-settings: '{global-settings}' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - provide-maven-settings: - settings-file: '{vpp-settings}' - global-settings-file: '{global-settings}' + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' - shell: !include-raw-escape: include-raw-vpp-maven-push.sh -- cgit 1.2.3-korg