commit 6a81b77260df05b43b28f572b0b52d35842f6305
author Davide Pesavento <davide.pesavento@lip6.fr> Sun Aug 20 18:43:46 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Sat Aug 26 17:06:00 2017 -0400
tree 37f71d53687b241ebcae0fa135b44dec421f758e
parent c0c6bcf7e29cf477659cbc31c67082e054f42742

ci: preserve PATH when running waf under sudo

Change-Id: I85bdc5b69de2c2c7b8c0dc5a7aa2927b495e2168
Refs: #4186

.jenkins.d/20-build.sh

diff --git a/.jenkins.d/20-build.sh b/.jenkins.d/20-build.sh
index 6306a52..a3c171e 100755
--- a/.jenkins.d/20-build.sh
+++ b/.jenkins.d/20-build.sh
@@ -1,27 +1,31 @@
 #!/usr/bin/env bash
-set -x
 set -e
 
+JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+source "$JDIR"/util.sh
+
+set -x
+
 git submodule init
 git submodule sync
 git submodule update
 
 # Cleanup
-sudo ./waf -j1 --color=yes distclean
+sudo env "PATH=$PATH" ./waf --color=yes distclean
 
 # Configure/build in debug mode
 ./waf -j1 --color=yes configure --with-tests --debug
 ./waf -j1 --color=yes build
 
 # Cleanup
-sudo ./waf -j1 --color=yes distclean
+sudo env "PATH=$PATH" ./waf --color=yes distclean
 
 # Configure/build in optimized mode without tests
 ./waf -j1 --color=yes configure
 ./waf -j1 --color=yes build
 
 # Cleanup
-sudo ./waf -j1 --color=yes distclean
+sudo env "PATH=$PATH" ./waf --color=yes distclean
 
 if [[ $JOB_NAME == *"code-coverage" ]]; then
     COVERAGE="--with-coverage"
@@ -35,4 +39,5 @@
 
 # (tests will be run against optimized version)
 
-sudo ./waf install --color=yes
+# Install
+sudo env "PATH=$PATH" ./waf --color=yes install