Merge branch 'master' into 14988-wb-rails5-upgrade

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --combined build/run-tests.sh
index 5ca3b8e42599dea5a0a5db952becfe6e51743849,d9dd1bbdd3d093e411a479712495ecd0d9849018..68fc15183e5a55cb488cab48c7f9a83367f6c075
--- 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
@@@ -394,7 -395,7 +395,7 @@@ start_services() 
          return 0
      fi
      . "$VENVDIR/bin/activate"
-     echo 'Starting API, keepproxy, keep-web, ws, arv-git-httpd, and nginx ssl proxy...'
+     echo 'Starting API, controller, keepproxy, keep-web, arv-git-httpd, ws, and nginx ssl proxy...'
      if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
        mkdir -p "$WORKSPACE/services/api/log"
      fi
@@@ -749,6 -750,7 +750,7 @@@ do_test_once() 
      title "test $1"
      timer_reset
  
+     result=
      if which deactivate >/dev/null; then deactivate; fi
      if ! . "$VENVDIR/bin/activate"
      then
@@@ -821,6 -823,7 +823,7 @@@ do_install_once() 
      title "install $1"
      timer_reset
  
+     result=
      if which deactivate >/dev/null; then deactivate; fi
      if [[ "$1" != "env" ]] && ! . "$VENVDIR/bin/activate"; then
          result=1
@@@ -955,6 -958,7 +958,7 @@@ install_services/api() 
              || return 1
  
      cd "$WORKSPACE/services/api" \
+         && RAILS_ENV=test bundle exec rails db:environment:set \
          && RAILS_ENV=test bundle exec rake db:drop \
          && RAILS_ENV=test bundle exec rake db:setup \
          && RAILS_ENV=test bundle exec rake db:fixtures:load
@@@ -971,6 -975,7 +975,7 @@@ pythonstuff=
      services/fuse
      services/nodemanager
      tools/crunchstat-summary
+     tools/crunchstat-summary:py3
  )
  
  declare -a gostuff
@@@ -1046,7 -1051,7 +1051,11 @@@ test_gofmt() 
  test_services/api() {
      rm -f "$WORKSPACE/services/api/git-commit.version"
      cd "$WORKSPACE/services/api" \
++<<<<<<< HEAD
 +        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec bin/rails test TESTOPTS='-v -d' ${testargs[services/api]}
++=======
+         && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS='-v -d' ${testargs[services/api]}
++>>>>>>> master
  }
  
  test_sdk/ruby() {
@@@ -1067,6 -1072,10 +1076,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]}
@@@ -1079,17 -1088,17 +1092,17 @@@ test_services/nodemanager_integration(
  
  test_apps/workbench_units() {
      cd "$WORKSPACE/apps/workbench" \
 -        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:units TESTOPTS=-v ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
 +        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:units TESTOPTS='-v -d' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
  }
  
  test_apps/workbench_functionals() {
      cd "$WORKSPACE/apps/workbench" \
 -        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:functionals TESTOPTS=-v ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
 +        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:functionals TESTOPTS='-v -d' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
  }
  
  test_apps/workbench_integration() {
      cd "$WORKSPACE/apps/workbench" \
 -        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:integration TESTOPTS=-v ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
 +        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:integration TESTOPTS='-v -d' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
  }
  
  test_apps/workbench_benchmark() {
@@@ -1164,6 -1173,7 +1177,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