11876: Pin R deps that are installed from gitub.

[arvados.git] / build / run-tests.sh

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 1ef15cd3dbe9974f2fe37619f06845b8964a4ecf..48b3eab38ac864ab0c66d4a40d17502f60d4cdb3 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -74,10 +74,10 @@ doc
 lib/cli
 lib/cmd
 lib/crunchstat
+lib/dispatchcloud
 services/api
 services/arv-git-httpd
 services/crunchstat
-services/dispatchcloud
 services/dockercleaner
 services/fuse
 services/health
@@ -781,19 +781,7 @@ do_install sdk/ruby ruby_sdk
 
 install_R_sdk() {
     cd "$WORKSPACE/sdk/R" \
-       && R --quiet --vanilla <<EOF
-options(repos=structure(c(CRAN="http://cran.wustl.edu/")))
-if (!requireNamespace("devtools")) {
-  install.packages("devtools")
-}
-if (!requireNamespace("roxygen2")) {
-  install.packages("roxygen2")
-}
-if (!requireNamespace("pkgdown")) {
-  devtools::install_github("hadley/pkgdown")
-}
-devtools::install_dev_deps()
-EOF
+       && R --quiet --vanilla --file=install_deps.R
 }
 do_install sdk/R R_sdk
 
@@ -889,6 +877,7 @@ gostuff=(
     lib/cli
     lib/cmd
     lib/crunchstat
+    lib/dispatchcloud
     sdk/go/arvados
     sdk/go/arvadosclient
     sdk/go/blockdigest
@@ -901,7 +890,6 @@ gostuff=(
     sdk/go/stats
     services/arv-git-httpd
     services/crunchstat
-    services/dispatchcloud
     services/health
     services/keep-web
     services/keepstore