16552: Update workbench2 version, boot it by default.

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

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index f923d5ef8ec571638d5d83681b37df120ed4a053..72688dc0a9c63687d2e55f951bddc3c51ae8aa44 100644 (file)
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -125,7 +125,7 @@ SUDO_FORCE_REMOVE=yes apt-get autoremove -y
 
 /etc/init.d/postgresql start
 arvados-server init -cluster-id x1234 -domain=$domain -login=test $initargs
-exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
+exec arvados-server boot -listen-host=0.0.0.0 $bootargs
 `)
        cmd.Stdout = stdout
        cmd.Stderr = stderr

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e407ec5b561c4bcbe87b9c9a38c9e81976e6c6e1..e22ae7ad7ea7104c6471f07286009013a2247cfa 100644 (file)
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -70,7 +70,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
        flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
        flags.StringVar(&super.Workbench2Source, "workbench2-source", "../arvados-workbench2", "path to arvados-workbench2 source tree")
        flags.BoolVar(&super.NoWorkbench1, "no-workbench1", false, "do not run workbench1")
-       flags.BoolVar(&super.NoWorkbench2, "no-workbench2", true, "do not run workbench2")
+       flags.BoolVar(&super.NoWorkbench2, "no-workbench2", false, "do not run workbench2")
        flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database")
        timeout := flags.Duration("timeout", 0, "maximum time to wait for cluster to be ready")
        shutdown := flags.Bool("shutdown", false, "shut down when the cluster becomes ready")

diff --git a/lib/install/deps.go b/lib/install/deps.go
index a7c32c5052b1970a4d57999faede6ac71dc89de9..44215a773a60ece36078111c0e02504c39022cd9 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -40,7 +40,7 @@ const (
        gradleversion           = "5.3.1"
        nodejsversion           = "v12.22.11"
        devtestDatabasePassword = "insecure_arvados_test"
-       workbench2version       = "5e020488f67b5bc919796e0dc8b0b9f3b3ff23b0"
+       workbench2version       = "2454ac35292a79594c32a80430740317ed5005cf"
 )
 
 //go:embed arvados.service