15003: Merge branch 'master' into 15003-preprocess-config

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined build/run-tests.sh
index a33dab7c32048d86dfec5fe7c8b08b76d83964ad,d8ae7c3c94df3cdf1c814e689b208a4b2dfcb1e3..956d82a575b88054c59ab711f51ef71f8ccf83d2
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -122,6 -122,7 +122,7 @@@ sdk/go/stat
  sdk/go/crunchrunner
  sdk/cwl
  sdk/R
+ sdk/java-v2
  tools/sync-groups
  tools/crunchstat-summary
  tools/crunchstat-summary:py3
@@@ -379,20 -380,6 +380,20 @@@ checkpidfile() 
      echo "${svc} pid ${pid} ok"
  }
  
 +checkhealth() {
 +    svc="$1"
 +    port="$(cat "$WORKSPACE/tmp/${svc}.port")"
 +    scheme=http
 +    if [[ ${svc} =~ -ssl$ || ${svc} = wss ]]; then
 +        scheme=https
 +    fi
 +    url="$scheme://localhost:${port}/_health/ping"
 +    if ! curl -Ss -H "Authorization: Bearer e687950a23c3a9bceec28c6223a06c79" "${url}" | tee -a /dev/stderr | grep '"OK"'; then
 +        echo "${url} failed"
 +        return 1
 +    fi
 +}
 +
  checkdiscoverydoc() {
      dd="https://${1}/discovery/v1/apis/arvados/v1/rest"
      if ! (set -o pipefail; curl -fsk "$dd" | grep -q ^{ ); then
@@@ -426,15 -413,12 +427,15 @@@ start_services() 
          && checkdiscoverydoc $ARVADOS_API_HOST \
          && python sdk/python/tests/run_test_server.py start_controller \
          && checkpidfile controller \
 +        && checkhealth controller \
          && python sdk/python/tests/run_test_server.py start_keep_proxy \
          && checkpidfile keepproxy \
          && python sdk/python/tests/run_test_server.py start_keep-web \
          && checkpidfile keep-web \
 +        && checkhealth keep-web \
          && python sdk/python/tests/run_test_server.py start_arv-git-httpd \
          && checkpidfile arv-git-httpd \
 +        && checkhealth arv-git-httpd \
          && python sdk/python/tests/run_test_server.py start_ws \
          && checkpidfile ws \
          && eval $(python sdk/python/tests/run_test_server.py start_nginx) \
@@@ -991,6 -975,7 +992,7 @@@ pythonstuff=
      services/fuse
      services/nodemanager
      tools/crunchstat-summary
+     tools/crunchstat-summary:py3
  )
  
  declare -a gostuff
@@@ -1004,7 -989,6 +1006,7 @@@ gostuff=
      lib/cloud
      lib/cloud/azure
      lib/cloud/ec2
 +    lib/config
      lib/dispatchcloud
      lib/dispatchcloud/container
      lib/dispatchcloud/scheduler
@@@ -1088,6 -1072,10 +1090,10 @@@ test_sdk/cli() 
          && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
  }
  
+ test_sdk/java-v2() {
+     cd "$WORKSPACE/sdk/java-v2" && gradle test
+ }
+ 
  test_services/login-sync() {
      cd "$WORKSPACE/services/login-sync" \
          && bundle exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
@@@ -1185,6 -1173,7 +1191,7 @@@ test_all() 
      do_test sdk/R
      do_test sdk/cli
      do_test services/login-sync
+     do_test sdk/java-v2
      do_test services/nodemanager_integration
      for p in "${pythonstuff[@]}"
      do