16053: Prefer dependencies in /var/lib/arvados/bin if they exist.
authorTom Clegg <tom@tomclegg.ca>
Mon, 16 Mar 2020 20:21:28 +0000 (16:21 -0400)
committerTom Clegg <tom@tomclegg.ca>
Mon, 16 Mar 2020 20:21:28 +0000 (16:21 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

build/run-tests.sh

index 7328fad45ee76025f6b8d503d379935ba000cd6a..f5c184e4926aa5a4ef6ce7f4f33a74c8b19cb151 100755 (executable)
@@ -590,6 +590,11 @@ setup_virtualenv() {
 }
 
 initialize() {
+    # If dependencies like ruby, go, etc. are installed in
+    # /var/lib/arvados -- presumably by "arvados-server install" --
+    # then we want to use those versions, instead of whatever happens
+    # to be installed in /usr.
+    PATH="/var/lib/arvados/bin:${PATH}"
     sanity_checks
 
     echo "WORKSPACE=$WORKSPACE"