X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3de17b282e8fc732862bd028c6d63ecfe70075af..5b2ebfe3b248790efbce3206b693dd93f369ea4e:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index b63a1b95c4..3cfc692aae 100755 --- 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 @@ -99,7 +100,7 @@ sdk/go/health sdk/go/httpserver sdk/go/manifest sdk/go/blockdigest -sdk/go/streamer +sdk/go/asyncbuf sdk/go/stats sdk/go/crunchrunner sdk/cwl @@ -206,8 +207,34 @@ sanity_checks() { which gitolite \ || fatal "No gitolite. Try: apt-get install gitolite3" echo -n 'npm: ' - 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/" + 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" + echo -n 'libattr1 xattr.h: ' + find /usr/include -path '*/attr/xattr.h' | egrep --max-count=1 . \ + || fatal "No libattr1 xattr.h. Try: apt-get install libattr1-dev" + echo -n 'libcurl curl.h: ' + find /usr/include -path '*/curl/curl.h' | egrep --max-count=1 . \ + || fatal "No libcurl curl.h. Try: apt-get install libcurl4-gnutls-dev" + echo -n 'libpq libpq-fe.h: ' + find /usr/include -path '*/postgresql/libpq-fe.h' | egrep --max-count=1 . \ + || fatal "No libpq libpq-fe.h. Try: apt-get install libpq-dev" + echo -n 'services/api/config/database.yml: ' + if [[ ! -f "$WORKSPACE/services/api/config/database.yml" ]]; then + fatal "Please provide a database.yml file for the test suite" + else + echo "OK" + fi + echo -n 'postgresql: ' + psql --version || fatal "No postgresql. Try: apt-get install postgresql postgresql-client-common" + echo -n 'phantomjs: ' + phantomjs --version || fatal "No phantomjs. Try: apt-get install phantomjs" + echo -n 'xvfb: ' + which Xvfb || fatal "No xvfb. Try: apt-get install xvfb" + echo -n 'graphviz: ' + dot -V || fatal "No graphviz. Try: apt-get install graphviz" } rotate_logfile() { @@ -279,6 +306,13 @@ done start_api() { echo 'Starting API server...' + if [[ ! -d "$WORKSPACE/services/api/log" ]]; then + mkdir -p "$WORKSPACE/services/api/log" + fi + # Remove empty api.pid file if it exists + if [[ -f "$WORKSPACE/tmp/api.pid" && ! -s "$WORKSPACE/tmp/api.pid" ]]; then + rm -f "$WORKSPACE/tmp/api.pid" + fi cd "$WORKSPACE" \ && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \ && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \ @@ -478,7 +512,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 @@ -795,12 +829,13 @@ gostuff=( sdk/go/health sdk/go/httpserver sdk/go/manifest - sdk/go/streamer + sdk/go/asyncbuf sdk/go/crunchrunner sdk/go/stats lib/crunchstat services/arv-git-httpd services/crunchstat + services/health services/keep-web services/keepstore sdk/go/keepclient