[ARVADOS] created: 2.1.0-301-gd4e2cb487

[Git user]

        at  d4e2cb48764041ad80ec779ed73d126b1146bcce (commit)


commit d4e2cb48764041ad80ec779ed73d126b1146bcce
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Fri Jan 29 14:07:25 2021 -0300

    WIP: Makes WB1 optional on arvados-boot.
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e0e275522..84cb8d27b 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -67,6 +67,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 	flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for service listeners")
 	flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
 	flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database")
+	flags.BoolVar(&super.EnableWorkbench1, "enable-workbench1", true, "setup and start a workbench1 instance")
 	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")
 	err := flags.Parse(args)
diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 752466c2a..cedb7b5d7 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -41,6 +41,7 @@ type Supervisor struct {
 	ListenHost           string // e.g., localhost
 	ControllerAddr       string // e.g., 127.0.0.1:8000
 	OwnTemporaryDatabase bool
+	EnableWorkbench1     bool
 	Stderr               io.Writer
 
 	logger  logrus.FieldLogger
@@ -227,10 +228,14 @@ 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", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api"}}},
-		installPassenger{src: "apps/workbench", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup
-		runPassenger{src: "apps/workbench", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}},
 		seedDatabase{},
 	}
+	if super.EnableWorkbench1 {
+		tasks = append(tasks,
+			installPassenger{src: "apps/workbench", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup
+			runPassenger{src: "apps/workbench", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}},
+		)
+	}
 	if super.ClusterType != "test" {
 		tasks = append(tasks,
 			runServiceCommand{name: "dispatch-cloud", svc: super.cluster.Services.Controller},

-----------------------------------------------------------------------


hooks/post-receive
--