commit 690003452d8aaeb8d588d68912e12e526c352ec7
author Carlos Amedee <carlos@golang.org> Tue May 12 16:56:32 2020 -0400
committer Carlos Amedee <carlos@golang.org> Wed May 13 20:45:56 2020 +0000
tree ac7f8cdb2c3bb2f3f4733d9b4c5f7994bb0caeb9
parent 3b94076fa1ef9573281b41dbf3c3b65b4a3ac679

cmd/buildlet/stage0: add arm aws hosts

This enables stage0 to be used on linux arm
and arm64 AWS instances.

Updates golang/go#36841

Change-Id: I597b8001ab00e701f6547748235d8967f5f5936c
Reviewed-on: https://go-review.googlesource.com/c/build/+/233799
Reviewed-by: Alexander Rakoczy <alex@golang.org>
Run-TryBot: Alexander Rakoczy <alex@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

cmd/buildlet/stage0/stage0.go

diff --git a/cmd/buildlet/stage0/stage0.go b/cmd/buildlet/stage0/stage0.go
index 47a6e48..85ea33d 100644
--- a/cmd/buildlet/stage0/stage0.go
+++ b/cmd/buildlet/stage0/stage0.go
@@ -78,14 +78,14 @@
 	switch osArch {
 	case "linux/arm":
 		switch env := os.Getenv("GO_BUILDER_ENV"); env {
-		case "linux-arm-arm5spacemonkey", "host-linux-arm-scaleway":
+		case "linux-arm-arm5spacemonkey", "host-linux-arm-scaleway", "host-linux-arm-aws":
 			// No setup currently.
 		default:
 			panic(fmt.Sprintf("unknown/unspecified $GO_BUILDER_ENV value %q", env))
 		}
 	case "linux/arm64":
 		switch env := os.Getenv("GO_BUILDER_ENV"); env {
-		case "host-linux-arm64-packet":
+		case "host-linux-arm64-packet", "host-linux-arm64-aws":
 			// No special setup.
 		default:
 			panic(fmt.Sprintf("unknown/unspecified $GO_BUILDER_ENV value %q", env))
@@ -152,6 +152,8 @@
 	case "linux-arm-arm5spacemonkey":
 		cmd.Args = append(cmd.Args, reverseHostTypeArgs("host-linux-arm5spacemonkey")...)
 		cmd.Args = append(cmd.Args, os.ExpandEnv("--workdir=${WORKDIR}"))
+	case "host-linux-arm-aws":
+		cmd.Args = append(cmd.Args, os.ExpandEnv("--workdir=${WORKDIR}"))
 	case "host-linux-arm-scaleway":
 		scalewayArgs := append(
 			reverseHostTypeArgs(buildEnv),
@@ -160,6 +162,8 @@
 		cmd.Args = append(cmd.Args,
 			scalewayArgs...,
 		)
+	case "host-linux-arm64-aws":
+		cmd.Args = append(cmd.Args, os.ExpandEnv("--workdir=${WORKDIR}"))
 	case "host-linux-mipsle-mengzhuo":
 		cmd.Args = append(cmd.Args, reverseHostTypeArgs(buildEnv)...)
 		cmd.Args = append(cmd.Args, os.ExpandEnv("--workdir=${WORKDIR}"))
@@ -194,6 +198,8 @@
 				"--reboot=false",
 				"--coordinator=farmer.golang.org:443",
 			)
+		case "host-linux-arm64-aws":
+			// no special configuration
 		default:
 			panic(fmt.Sprintf("unknown/unspecified $GO_BUILDER_ENV value %q", env))
 		}