X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/70459cdae1f4e92789a14c1fecb66f5954a5aa7f..b205525d0b7c7b9042513fe77d2e8061534208ae:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index 26a907fc2f..cb44372566 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -77,6 +77,10 @@ lib/cmd lib/controller lib/crunchstat lib/dispatchcloud +lib/dispatchcloud/container +lib/dispatchcloud/scheduler +lib/dispatchcloud/ssh_executor +lib/dispatchcloud/worker services/api services/arv-git-httpd services/crunchstat @@ -245,6 +249,8 @@ sanity_checks() { which Xvfb || fatal "No xvfb. Try: apt-get install xvfb" echo -n 'graphviz: ' dot -V || fatal "No graphviz. Try: apt-get install graphviz" + echo -n 'geckodriver: ' + geckodriver --version | grep ^geckodriver || echo "No geckodriver. Try: wget -O- https://github.com/mozilla/geckodriver/releases/download/v0.23.0/geckodriver-v0.23.0-linux64.tar.gz | sudo tar -C /usr/local/bin -xzf - geckodriver" if [[ "$NEED_SDK_R" = true ]]; then # R SDK stuff @@ -687,7 +693,7 @@ do_test_once() { # before trying "go test". Otherwise, coverage-reporting # mode makes Go show the wrong line numbers when reporting # compilation errors. - go get -t "git.curoverse.com/arvados.git/$1" && \ + go get -ldflags "-X main.version=${ARVADOS_VERSION:-$(git log -n1 --format=%H)-dev}" -t "git.curoverse.com/arvados.git/$1" && \ cd "$GOPATH/src/git.curoverse.com/arvados.git/$1" && \ [[ -z "$(gofmt -e -d . | tee /dev/stderr)" ]] && \ if [[ -n "${testargs[$1]}" ]] @@ -755,7 +761,7 @@ do_install_once() { timer_reset if [[ "$2" == "go" ]] then - go get -t "git.curoverse.com/arvados.git/$1" + go get -ldflags "-X main.version=${ARVADOS_VERSION:-$(git log -n1 --format=%H)-dev}" -t "git.curoverse.com/arvados.git/$1" elif [[ "$2" == "pip" ]] then # $3 can name a path directory for us to use, including trailing @@ -924,6 +930,10 @@ gostuff=( lib/controller lib/crunchstat lib/dispatchcloud + lib/dispatchcloud/container + lib/dispatchcloud/scheduler + lib/dispatchcloud/ssh_executor + lib/dispatchcloud/worker sdk/go/arvados sdk/go/arvadosclient sdk/go/auth