cmd/gomote: add -setup flag to create

For golang/go#53956. Change-Id: I75b3e4301b9749fda9d0ee117c38dd5c6b86e934 Reviewed-on: https://go-review.googlesource.com/c/build/+/418301 Run-TryBot: Michael Knyszek <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> Auto-Submit: Michael Knyszek <[email protected]>
golang · Nov 18, 2022 · d44332d · d44332d
1 parent 5f25536
commit d44332d
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/cmd/gomote/create.go b/cmd/gomote/create.go
@@ -162,13 +162,24 @@ func create(args []string) error {
 	fs.BoolVar(&status, "status", true, "print regular status updates while waiting")
 	var count int
 	fs.IntVar(&count, "count", 1, "number of instances to create")
+	var setup bool
+	fs.BoolVar(&setup, "setup", false, "set up the instance by pushing GOROOT and building the Go toolchain")
 
 	fs.Parse(args)
 	if fs.NArg() != 1 {
 		fs.Usage()
 	}
 	builderType := fs.Arg(0)
 
+	var tmpOutDir string
+	var err error
+	if setup {
+		tmpOutDir, err = os.MkdirTemp("", "gomote")
+		if err != nil {
+			return fmt.Errorf("failed to create a temporary directory for setup output: %v", err)
+		}
+	}
+
 	var activeGroupMu sync.Mutex
 	eg, ctx := errgroup.WithContext(context.Background())
 	client := gomoteServerClient(ctx)
@@ -180,7 +191,7 @@ func create(args []string) error {
 			if err != nil {
 				return fmt.Errorf("failed to create buildlet: %v", statusFromError(err))
 			}
-			var instanceName string
+			var inst string
 		updateLoop:
 			for {
 				update, err := stream.Recv()
@@ -192,16 +203,37 @@ func create(args []string) error {
 				case update.GetStatus() != protos.CreateInstanceResponse_COMPLETE && status:
 					fmt.Fprintf(os.Stderr, "# still creating %s (%d) after %v; %d requests ahead of you\n", builderType, i+1, time.Since(start).Round(time.Second), update.GetWaitersAhead())
 				case update.GetStatus() == protos.CreateInstanceResponse_COMPLETE:
-					instanceName = update.GetInstance().GetGomoteId()
+					inst = update.GetInstance().GetGomoteId()
 				}
 			}
-			fmt.Println(instanceName)
+			fmt.Println(inst)
 			if activeGroup != nil {
 				activeGroupMu.Lock()
-				activeGroup.Instances = append(activeGroup.Instances, instanceName)
+				activeGroup.Instances = append(activeGroup.Instances, inst)
 				activeGroupMu.Unlock()
 			}
-			return nil
+			if !setup {
+				return nil
+			}
+			detailedProgress := count == 1
+			goroot, err := getGOROOT()
+			if err != nil {
+				return err
+			}
+			if !detailedProgress {
+				fmt.Fprintf(os.Stderr, "# Pushing GOROOT %q to %q...\n", goroot, inst)
+			}
+			if err := doPush(ctx, inst, goroot, false, detailedProgress); err != nil {
+				return err
+			}
+			cmd := "go/src/make.bash"
+			if strings.Contains(builderType, "windows") {
+				cmd = "go/src/make.bat"
+			}
+			if !detailedProgress {
+				fmt.Fprintf(os.Stderr, "# Running %q on %q...\n", cmd, inst)
+			}
+			return doRun(ctx, inst, tmpOutDir, cmd, []string{}, count == 1)
 		})
 	}
 	if err := eg.Wait(); err != nil {

diff --git a/cmd/gomote/push.go b/cmd/gomote/push.go
@@ -322,7 +322,7 @@ func push(args []string) error {
 	for _, inst := range pushSet {
 		inst := inst
 		eg.Go(func() error {
-			fmt.Fprintf(os.Stderr, "# Pushing to %q...\n", inst)
+			fmt.Fprintf(os.Stderr, "# Pushing GOROOT %q to %q...\n", goroot, inst)
 			return doPush(ctx, inst, goroot, dryRun, detailedProgress)
 		})
 	}