Merge branch 'master' into 12018-sync-groups-tool

[arvados.git] / build / run-tests.sh

diff --git a/build/run-tests.sh b/build/run-tests.sh
index e254d61ee2ab51d1941e877e42bc8af13ec5f9f4..e1e83edbc8c85f9e0a8f84dd0ccc6a613d5d8d8a 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -75,6 +75,7 @@ services/arv-git-httpd
 services/crunchstat
 services/dockercleaner
 services/fuse
+services/health
 services/keep-web
 services/keepproxy
 services/keepstore
@@ -103,6 +104,7 @@ sdk/go/streamer
 sdk/go/stats
 sdk/go/crunchrunner
 sdk/cwl
+tools/arv-sync-groups
 tools/crunchstat-summary
 tools/keep-exercise
 tools/keep-rsync
@@ -204,8 +206,12 @@ sanity_checks() {
     echo -n 'gitolite: '
     which gitolite \
         || fatal "No gitolite. Try: apt-get install gitolite3"
-    which npm \
-          || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.xz | sudo tar -C /usr/local xJf - && sudo ln -s ../node-v6.11.2-linux-x64/bin/{node,npm} /usr/local/bin/"
+    echo -n 'npm: '
+    npm --version \
+        || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v6.11.2-linux-x64/bin/{node,npm} /usr/local/bin/"
+    echo -n 'cadaver: '
+    cadaver --version | grep -w cadaver \
+          || fatal "No cadaver. Try: apt-get install cadaver"
 }
 
 rotate_logfile() {
@@ -476,7 +482,7 @@ pip freeze | grep -x llfuse==1.2.0 || (
     yes | pip uninstall llfuse || true
     cython --version || fatal "no cython; try sudo apt-get install cython"
     cd "$temp"
-    (cd python-llfuse || git clone https://github.com/curoverse/python-llfuse)
+    (cd python-llfuse 2>/dev/null || git clone https://github.com/curoverse/python-llfuse)
     cd python-llfuse
     git checkout 620722fd990ea642ddb8e7412676af482c090c0c
     git checkout setup.py
@@ -799,6 +805,7 @@ gostuff=(
     lib/crunchstat
     services/arv-git-httpd
     services/crunchstat
+    services/health
     services/keep-web
     services/keepstore
     sdk/go/keepclient
@@ -811,6 +818,7 @@ gostuff=(
     tools/keep-block-check
     tools/keep-exercise
     tools/keep-rsync
+    tools/arv-sync-groups
 )
 for g in "${gostuff[@]}"
 do