1 files changed, 10 insertions, 3 deletions
diff --git a/node/lava-submit b/node/lava-submit
index 23a17b3..b06ddd9 100755
--- a/node/lava-submit
+++ b/node/lava-submit
@@ -9,14 +9,21 @@
 ###############################################################################
 
 set -xe
-
 BUILD_SCRIPT_ROOT=$(readlink -f "$(dirname "${0}")/../build-scripts")
+source "${BUILD_SCRIPT_ROOT}"/helpers
 
 cd build
-sudo -E -H -u jenkins-build bash -xes "${BUILD_SCRIPT_ROOT}" "$@" <<\EOF
+
+if is_on_ec2; then
+    exec_cmd="sudo -E -H -u jenkins-build bash"
+else
+    exec_cmd="bash"
+fi
+$exec_cmd -xes "${BUILD_SCRIPT_ROOT}" "$@" <<\EOF
 export BUILD_SCRIPT_ROOT="${1}"
 set -a
-source /var/run/build-tools/build-config
+source "${BUILD_SCRIPT_ROOT}"/helpers
+source $(get_build_config)/build-tools/build-config
 set +a
 
 if [ -z "$LAVA_SUBMIT" -o "$LAVA_SUBMIT" = "0" ]; then