From 359cec6a7135d2dce0a8bbcf2a218c12072faca2 Mon Sep 17 00:00:00 2001 From: Vanessa Rene Valderrama Date: Thu, 1 Sep 2016 17:36:38 -0500 Subject: [PATCH] Adding Maven environment variables Change-Id: I9c18f2219c811eaaa7dcada8af8c198a021fcb86 Signed-off-by: Vanessa Rene Valderrama --- jjb/nsh_sfc/nsh_sfc.yaml | 30 ++++++++++++++++++++++++++++++ jjb/scripts/create_maven_env.sh | 3 +++ 2 files changed, 33 insertions(+) create mode 100644 jjb/scripts/create_maven_env.sh diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index c9a946091..ee11c12c6 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -65,6 +65,16 @@ settings-type: cfp global-settings: 'global-settings' global-settings-type: cfp + - config-file-provider: + files: + - file-id: 'nsh_sfc-settings' + variable: 'SETTINGS_FILE' + - file-id: 'global-settings' + variable: 'GLOBAL_SETTINGS_FILE' + - shell: + !include-raw-escape: ../scripts/create_maven_env.sh + - inject: + properties-file: maven_env.txt - shell: !include-raw-escape: - ../scripts/cleanup_vpp_plugin_dev_env.sh @@ -132,6 +142,16 @@ settings-type: cfp global-settings: 'global-settings' global-settings-type: cfp + - config-file-provider: + files: + - file-id: 'nsh_sfc-settings' + variable: 'SETTINGS_FILE' + - file-id: 'global-settings' + variable: 'GLOBAL_SETTINGS_FILE' + - shell: + !include-raw-escape: ../scripts/create_maven_env.sh + - inject: + properties-file: maven_env.txt - shell: !include-raw-escape: - ../scripts/cleanup_vpp_plugin_dev_env.sh @@ -178,6 +198,16 @@ branch: '{branch}' builders: + - config-file-provider: + files: + - file-id: 'nsh_sfc-settings' + variable: 'SETTINGS_FILE' + - file-id: 'global-settings' + variable: 'GLOBAL_SETTINGS_FILE' + - shell: + !include-raw-escape: ../scripts/create_maven_env.sh + - inject: + properties-file: maven_env.txt - shell: !include-raw-escape: - ../scripts/cleanup_vpp_plugin_dev_env.sh diff --git a/jjb/scripts/create_maven_env.sh b/jjb/scripts/create_maven_env.sh new file mode 100644 index 000000000..c74d54679 --- /dev/null +++ b/jjb/scripts/create_maven_env.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "MAVEN_SETTINGS_OPTIONS='-s \$SETTINGS_FILE -gs \$GLOBAL_SETTINGS_FILE'" > maven_env.txt -- 2.16.6