14287: Merge branch 'master' into 14287-federated-list

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

diff --combined build/run-tests.sh
index 51d80c34ae889dee44b2ba3660fdd55984935b61,3c69ae91d639aea47452728de856fe8f66de8f01..7c21a296406d42c7f06fbc88fcfcae0dd2509ad8
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -209,8 -209,8 +209,8 @@@ sanity_checks() 
      echo -n 'go: '
      go version \
          || fatal "No go binary. See http://golang.org/doc/install"
-     [[ $(go version) =~ go1.([0-9]+) ]] && [[ ${BASH_REMATCH[1]} -ge 10 ]] \
-         || fatal "Go >= 1.10 required. See http://golang.org/doc/install"
+     [[ $(go version) =~ go1.([0-9]+) ]] && [[ ${BASH_REMATCH[1]} -ge 12 ]] \
+         || fatal "Go >= 1.12 required. See http://golang.org/doc/install"
      echo -n 'gcc: '
      gcc --version | egrep ^gcc \
          || fatal "No gcc. Try: apt-get install build-essential"
@@@ -616,6 -616,8 +616,8 @@@ initialize() 
      export R_LIBS
  
      export GOPATH
+     # Make sure our compiled binaries under test override anything
+     # else that might be in the environment.
      export PATH=$GOPATH/bin:$PATH
  
      # Jenkins config requires that glob tmp/*.log match something. Ensure
@@@ -656,7 -658,6 +658,7 @@@ install_env() 
          cd "$GOPATH/src/git.curoverse.com/arvados.git"
          go get -v -d ...
          "$GOPATH/bin/govendor" sync
 +        which goimports >/dev/null || go get golang.org/x/tools/cmd/goimports
      ) || fatal "Go setup failed"
  
      setup_virtualenv "$VENVDIR" --python python2.7
@@@ -925,7 -926,6 +927,7 @@@ install_services/login-sync() 
  }
  
  install_services/api() {
 +    stop_services
      cd "$WORKSPACE/services/api" \
          && RAILS_ENV=test bundle_install_trylocal
  
@@@ -990,7 -990,7 +992,7 @@@ pythonstuff=
  )
  
  declare -a gostuff
- gostuff=($(git grep -lw func | grep \\.go | sed -e 's/\/[^\/]*$//' | sort -u))
+ gostuff=($(cd "$WORKSPACE" && git grep -lw func | grep \\.go | sed -e 's/\/[^\/]*$//' | sort -u))
  
  install_apps/workbench() {
      cd "$WORKSPACE/apps/workbench" \
@@@ -1157,11 -1157,11 +1159,11 @@@ install_all() 
              fi
          fi
      done
-     do_install services/api
      for g in "${gostuff[@]}"
      do
          do_install "$g" go
      done
+     do_install services/api
      do_install apps/workbench
  }
  
@@@ -1238,6 -1238,13 +1240,13 @@@ for p in "${pythonstuff[@]}"; d
  done
  
  testfuncargs["sdk/cli"]="sdk/cli"
+ testfuncargs["sdk/R"]="sdk/R"
+ testfuncargs["sdk/java-v2"]="sdk/java-v2"
+ testfuncargs["apps/workbench_units"]="apps/workbench_units"
+ testfuncargs["apps/workbench_functionals"]="apps/workbench_functionals"
+ testfuncargs["apps/workbench_integration"]="apps/workbench_integration"
+ testfuncargs["apps/workbench_benchmark"]="apps/workbench_benchmark"
+ testfuncargs["apps/workbench_profile"]="apps/workbench_profile"
  
  if [[ -z ${interactive} ]]; then
      install_all