From: Tom Clegg <tom@curii.com>
Date: Thu, 17 Feb 2022 15:25:11 +0000 (-0500)
Subject: 18700: Don't start workbench2 in integration test clusters.
X-Git-Tag: 2.5.0~214^2~37
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/adbbe252483b5442707c1e2e03f5347f913e1125

18700: Don't start workbench2 in integration test clusters.

Default to -no-workbench2=true until wb2 test setup script can be
updated.

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

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e13848db77..9c3047a7b6 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -70,6 +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.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/boot/supervisor.go b/lib/boot/supervisor.go
index 8746183e6c..0905fd44a3 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -44,6 +44,7 @@ type Supervisor struct {
 	ControllerAddr       string // e.g., 127.0.0.1:8000
 	Workbench2Source     string // e.g., /home/username/src/arvados-workbench2
 	NoWorkbench1         bool
+	NoWorkbench2         bool
 	OwnTemporaryDatabase bool
 	Stderr               io.Writer
 
@@ -251,7 +252,6 @@ func (super *Supervisor) run(cfg *arvados.Config) error {
 		runServiceCommand{name: "ws", svc: super.cluster.Services.Websocket, depends: []supervisedTask{seedDatabase{}}},
 		installPassenger{src: "services/api"},
 		runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api"}}},
-		runWorkbench2{svc: super.cluster.Services.Workbench2},
 		seedDatabase{},
 	}
 	if !super.NoWorkbench1 {
@@ -260,6 +260,11 @@ func (super *Supervisor) run(cfg *arvados.Config) error {
 			runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}},
 		)
 	}
+	if !super.NoWorkbench2 {
+		tasks = append(tasks,
+			runWorkbench2{svc: super.cluster.Services.Workbench2},
+		)
+	}
 	if super.ClusterType != "test" {
 		tasks = append(tasks,
 			runServiceCommand{name: "dispatch-cloud", svc: super.cluster.Services.DispatchCloud},
@@ -704,7 +709,8 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 				svc.ExternalURL = arvados.URL{Scheme: "wss", Host: host, Path: "/websocket"}
 			}
 		}
-		if super.NoWorkbench1 && svc == &cluster.Services.Workbench1 {
+		if super.NoWorkbench1 && svc == &cluster.Services.Workbench1 ||
+			super.NoWorkbench2 && svc == &cluster.Services.Workbench2 {
 			// When workbench1 is disabled, it gets an
 			// ExternalURL (so we have a valid listening
 			// port to write in our Nginx config) but no
diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 9f5d12598b..6ffbbd2720 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -135,6 +135,7 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
 			filepath.Join(cwd, "..", ".."),
 			id, cfg, "127.0.0."+id[3:], c.Log)
 		tc.Super.NoWorkbench1 = true
+		tc.Super.NoWorkbench2 = true
 		tc.Start()
 		s.testClusters[id] = tc
 	}
diff --git a/tools/sync-groups/federation_test.go b/tools/sync-groups/federation_test.go
index 1bbdaa3fa3..d5fed3e29f 100644
--- a/tools/sync-groups/federation_test.go
+++ b/tools/sync-groups/federation_test.go
@@ -115,6 +115,7 @@ func (s *FederationSuite) SetUpSuite(c *check.C) {
 			filepath.Join(cwd, "..", ".."),
 			id, cfg, "127.0.0."+id[3:], c.Log)
 		tc.Super.NoWorkbench1 = true
+		tc.Super.NoWorkbench2 = true
 		tc.Start()
 		s.testClusters[id] = tc
 	}