From e47293395f0908a708680df773780ce418b48de9 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 30 Jun 2022 01:36:06 -0400 Subject: [PATCH] 16552: Update workbench2 version, boot it by default. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/install.go | 2 +- lib/boot/cmd.go | 2 +- lib/install/deps.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go index f923d5ef8e..72688dc0a9 100644 --- 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 e407ec5b56..e22ae7ad7e 100644 --- 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 a7c32c5052..44215a773a 100644 --- 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 -- 2.30.2