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 4ebaf07c13e5ae37a8cb70124a4870fda726b1ef..48b3eab38ac864ab0c66d4a40d17502f60d4cdb3 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -74,6 +74,7 @@ doc
 lib/cli
 lib/cmd
 lib/crunchstat
+lib/dispatchcloud
 services/api
 services/arv-git-httpd
 services/crunchstat
@@ -249,6 +250,8 @@ sanity_checks() {
     R -q -e "library('testthat')" || fatal "No testthat. Try: apt-get install r-cran-testthat"
     # needed for roxygen2, needed for devtools, needed for R sdk
     pkg-config --exists libxml-2.0 || fatal "No libxml2. Try: apt-get install libxml2-dev"
+    # needed for pkgdown, builds R SDK doc pages
+    which pandoc || fatal "No pandoc. Try: apt-get install pandoc"
 }
 
 rotate_logfile() {
@@ -778,16 +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")
-}
-devtools::install_dev_deps()
-EOF
+       && R --quiet --vanilla --file=install_deps.R
 }
 do_install sdk/R R_sdk
 
@@ -883,6 +877,7 @@ gostuff=(
     lib/cli
     lib/cmd
     lib/crunchstat
+    lib/dispatchcloud
     sdk/go/arvados
     sdk/go/arvadosclient
     sdk/go/blockdigest