16306: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc build/run-tests.sh
Simple merge

diff --cc doc/_config.yml
Simple merge

diff --cc doc/install/index.html.textile.liquid
index 81d7b21592d181c19eceb32e4b568de6db015791,1b27ca6ed9a7727b788f5a7aac6d691349d96e32..f16ae2dad2af0a39afdfffcb4104034fa946ec35
--- 1/doc/install/index.html.textile.liquid
--- 2/doc/install/index.html.textile.liquid
+++ b/doc/install/index.html.textile.liquid
@@@ -20,11 -20,12 +20,13 @@@ Arvados components can be installed an
  <div class="offset1">
  table(table table-bordered table-condensed).
  |||\5=. Appropriate for|
- ||_. Ease of setup|_. Multiuser/networked access|_. Workflow Development and Testing|_. Large Scale Production|_. Development of Arvados|_. Arvados Evaluation|
+ ||_. Setup difficulty|_. Multiuser/networked access|_. Workflow Development and Testing|_. Large Scale Production|_. Development of Arvados|_. Arvados Evaluation|
  |"Arvados-in-a-box":arvbox.html (arvbox)|Easy|no|yes|no|yes|yes|
+ |"Installation with Salt":salt-single-host.html (single host)|Easy|no|yes|no|yes|yes|
+ |"Installation with Salt":salt-multi-host.html (multi host)|Moderate|yes|yes|yes|yes|yes|
  |"Arvados on Kubernetes":arvados-on-kubernetes.html|Easy ^1^|yes|yes ^2^|no ^2^|no|yes|
- |"Manual installation":install-manual-prerequisites.html|Complicated|yes|yes|yes|no|no|
 +|"Automatic single-node install":automatic.html (experimental)|Easy|yes|yes|no|yes|yes|
+ |"Manual installation":install-manual-prerequisites.html|Hard|yes|yes|yes|no|no|
  |"Cluster Operation Subscription supported by Curii":mailto:info@curii.com|N/A ^3^|yes|yes|yes|yes|yes|
  </div>
  

diff --cc lib/boot/postgresql.go
Simple merge

diff --cc lib/boot/seed.go
Simple merge

diff --cc lib/boot/supervisor.go
Simple merge

diff --cc lib/install/deps.go
index da45b393bf62da8b2ea2b60fbd00f2da00fbfa26,342ef03a7f8efb239e9594c9aea84873b69a15ea..cc9595db64f5562b641c665d9463480430364199
--- 1/lib/install/deps.go
--- 2/lib/install/deps.go
+++ b/lib/install/deps.go
@@@ -124,8 -101,10 +124,9 @@@ func (inst *installCommand) RunCommand(
                        "bison",
                        "bsdmainutils",
                        "build-essential",
 -                      "ca-certificates",
                        "cadaver",
-                       "cython",
+                       "curl",
+                       "cython3",
                        "daemontools", // lib/boot uses setuidgid to drop privileges when running as root
                        "default-jdk-headless",
                        "default-jre-headless",
@@@ -136,9 -120,13 +137,9 @@@
                        "libfuse-dev",
                        "libgnutls28-dev",
                        "libjson-perl",
 -                      "libjson-perl",
                        "libpam-dev",
                        "libpcre3-dev",
-                       "libpython2.7-dev",
+                       "libpq-dev",
                        "libreadline-dev",
                        "libssl-dev",
                        "libwww-perl",
@@@ -154,22 -142,28 +155,27 @@@
                        "postgresql",
                        "postgresql-contrib",
                        "python3-dev",
-                       "python-epydoc",
+                       "python3-venv",
+                       "python3-virtualenv",
                        "r-base",
                        "r-cran-testthat",
+                       "r-cran-devtools",
+                       "r-cran-knitr",
+                       "r-cran-markdown",
+                       "r-cran-roxygen2",
+                       "r-cran-xml",
                        "sudo",
-                       "virtualenv",
                        "wget",
                        "xvfb",
 -                      "zlib1g-dev",
 -              }
 +              )
                switch {
                case osv.Debian && osv.Major >= 10:
 -                      debs = append(debs, "libcurl4")
 +                      pkgs = append(pkgs, "libcurl4")
                default:
 -                      debs = append(debs, "libcurl3")
 +                      pkgs = append(pkgs, "libcurl3")
                }
                cmd := exec.CommandContext(ctx, "apt-get", "install", "--yes", "--no-install-recommends")
 -              cmd.Args = append(cmd.Args, debs...)
 +              cmd.Args = append(cmd.Args, pkgs...)
                cmd.Env = append(os.Environ(), "DEBIAN_FRONTEND=noninteractive")
                cmd.Stdout = stdout
                cmd.Stderr = stderr