Merge branch 'master' into 8028-crunch-dispatch-local

[arvados-dev.git] / jenkins / run-tests.sh

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 57beafa4e2235f7d39be2ba4702e3d4e1e5ae5e1..12890951f41f6e945a4afe45e99cfe3088ad5cdf 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -68,6 +68,7 @@ services/keepproxy
 services/keepstore
 services/login-sync
 services/nodemanager
+services/crunch-dispatch-local
 sdk/cli
 sdk/pam
 sdk/python
@@ -75,7 +76,10 @@ sdk/ruby
 sdk/go/arvadosclient
 sdk/go/keepclient
 sdk/go/manifest
+sdk/go/blockdigest
 sdk/go/streamer
+sdk/go/crunchrunner
+tools/crunchstat-summary
 tools/keep-rsync
 
 EOF
@@ -390,13 +394,13 @@ gem_uninstall_if_exists() {
 }
 
 setup_virtualenv() {
-    local venvdest=$1; shift
+    local venvdest="$1"; shift
     if ! [[ -e "$venvdest/bin/activate" ]] || ! [[ -e "$venvdest/bin/pip" ]]; then
         virtualenv --setuptools "$@" "$venvdest" || fatal "virtualenv $venvdest failed"
     fi
     "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
     # ubuntu1404 can't seem to install mock via tests_require, but it can do this.
-    "$venvdest/bin/pip" install 'mock>=1.0'
+    "$venvdest/bin/pip" install 'mock>=1.0' 'pbr<1.7.0'
 }
 
 export PERLINSTALLBASE
@@ -640,6 +644,7 @@ pythonstuff=(
     sdk/python
     services/fuse
     services/nodemanager
+    tools/crunchstat-summary
     )
 for p in "${pythonstuff[@]}"
 do
@@ -702,8 +707,10 @@ do_install services/api apiserver
 declare -a gostuff
 gostuff=(
     sdk/go/arvadosclient
+    sdk/go/blockdigest
     sdk/go/manifest
     sdk/go/streamer
+    sdk/go/crunchrunner
     services/arv-git-httpd
     services/crunchstat
     services/keep-web
@@ -714,6 +721,8 @@ gostuff=(
     services/datamanager/collection
     services/datamanager/keep
     services/datamanager
+    services/crunch-dispatch-local
+    services/crunch-run
     tools/keep-rsync
     )
 for g in "${gostuff[@]}"