From 6101e2e98a05cde8a50b22037dd49436bc786bfe Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Mon, 29 Aug 2016 12:36:41 -0700 Subject: [PATCH] Enable NSH_SFC to use mvn to build its java bindings Change-Id: Ie337a3de765d290f4777577f35ad3563668958e8 Signed-off-by: Ed Warnicke --- jjb/nsh_sfc/include-raw-nsh_sfc-build.sh | 3 +++ jjb/nsh_sfc/nsh_sfc.yaml | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh index 1d5d27c53..1257b7fb2 100644 --- a/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh @@ -28,6 +28,9 @@ fi echo "sha1sum of this script: ${0}" sha1sum $0 +export MAVEN_HOME="/opt/apache/maven/" +export PATH=${MAVEN_HOME}/bin:${PATH} + scripts/ci/verify.sh echo "*******************************************************************" diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 6a21f5c71..ab8265bdc 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -58,6 +58,13 @@ branch: '{branch}' builders: + - maven-target: + maven-version: '{mvn33}' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - shell: !include-raw-escape: - ../scripts/cleanup_vpp_plugin_dev_env.sh @@ -118,6 +125,13 @@ notbuilt: true builders: + - maven-target: + maven-version: '{mvn33}' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - shell: !include-raw-escape: - ../scripts/cleanup_vpp_plugin_dev_env.sh -- 2.16.6