dashboard: add linux-arm-aws to trybots

This change adds linux-arm-aws to the set of trybots. The related
changes include:
- Renaming the linux-arm builder to linux-arm-scaleway.
- Adding slowbot aliases which use linux-arm-aws as the default
  builder for linux-arm builds.

Fixes golang/go#35628
Fixes golang/go#40872
Updates golang/go#45064

Change-Id: Ib49f50e03fc4f766015fdd78080b804c2784a398
Reviewed-on: https://go-review.googlesource.com/c/build/+/303230
Trust: Carlos Amedee <carlos@golang.org>
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/cmd/release/release.go b/cmd/release/release.go
index 5f5a609..d142762 100644
--- a/cmd/release/release.go
+++ b/cmd/release/release.go
@@ -241,7 +241,7 @@
 		GoQuery: "< go1.16beta1",
 		OS:      "linux",
 		Arch:    "arm",
-		Builder: "linux-arm",
+		Builder: "linux-arm-scaleway",
 		Goarm:   6, // For compatibility with all Raspberry Pi models.
 		// The tests take too long for the release packaging.
 		// Much of the time the whole buildlet times out.
diff --git a/cmd/release/release_test.go b/cmd/release/release_test.go
index 4c87bf1..e7d8e90 100644
--- a/cmd/release/release_test.go
+++ b/cmd/release/release_test.go
@@ -89,7 +89,7 @@
 		{"go1.16", "linux-386", "linux-386-stretch"},
 
 		// Go 1.15.x still uses the Packet and Scaleway builders.
-		{"go1.15.55", "linux-armv6l", "linux-arm"},
+		{"go1.15.55", "linux-armv6l", "linux-arm-scaleway"},
 		// Go 1.16 starts to use the the AWS builders.
 		{"go1.16", "linux-arm64", "linux-arm64-aws"},
 		{"go1.16", "linux-armv6l", "linux-arm-aws"},
diff --git a/dashboard/builders.go b/dashboard/builders.go
index e8b1752..ec0bf6e 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -36,7 +36,7 @@
 	"android-amd64":        "android-amd64-emu",
 	"android-arm":          "android-arm-corellium",
 	"android-arm64":        "android-arm64-corellium",
-	"arm":                  "linux-arm",
+	"arm":                  "linux-arm-aws",
 	"arm64":                "linux-arm64-packet",
 	"darwin":               "darwin-amd64-10_14",
 	"darwin-amd64":         "darwin-amd64-10_14",
@@ -52,6 +52,7 @@
 	"ios":                  "ios-arm64-corellium",
 	"js":                   "js-wasm",
 	"linux":                "linux-amd64",
+	"linux-arm":            "linux-arm-aws",
 	"linux-arm64":          "linux-arm64-packet",
 	"linux-mips":           "linux-mips-rtrk",
 	"linux-mips64":         "linux-mips64-rtrk",
@@ -1899,7 +1900,7 @@
 		numTryTestHelpers: 4, // Target time is < 15 min for golang.org/issue/42661.
 	})
 	addBuilder(BuildConfig{
-		Name:     "linux-arm",
+		Name:     "linux-arm-scaleway",
 		HostType: "host-linux-arm-scaleway",
 		CrossCompileConfig: &CrossCompileConfig{
 			CompileHostType:    "host-linux-armhf-cross",
@@ -2413,8 +2414,10 @@
 		HostType: "host-linux-arm64-aws",
 	})
 	addBuilder(BuildConfig{
-		Name:     "linux-arm-aws",
-		HostType: "host-linux-arm-aws",
+		Name:              "linux-arm-aws",
+		HostType:          "host-linux-arm-aws",
+		tryBot:            defaultTrySet(),
+		numTryTestHelpers: 1,
 	})
 	addBuilder(BuildConfig{
 		FlakyNet:       true,
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 9ac9560..4ab4c5d 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -97,17 +97,18 @@
 				"linux-386",
 				"linux-amd64",
 				"linux-amd64-race",
-				"misc-compile-other",
+				"linux-arm-aws",
 				"misc-compile-darwin",
 				"misc-compile-darwinarm64",
-				"misc-compile-linuxarm",
-				"misc-compile-solaris",
 				"misc-compile-freebsd",
+				"misc-compile-linuxarm",
 				"misc-compile-mips",
 				"misc-compile-netbsd",
 				"misc-compile-openbsd",
+				"misc-compile-other",
 				"misc-compile-plan9",
 				"misc-compile-ppc",
+				"misc-compile-solaris",
 				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
@@ -123,17 +124,18 @@
 				"linux-386",
 				"linux-amd64",
 				"linux-amd64-race",
-				"misc-compile-other",
+				"linux-arm-aws",
 				"misc-compile-darwin",
 				"misc-compile-darwinarm64",
-				"misc-compile-linuxarm",
-				"misc-compile-solaris",
 				"misc-compile-freebsd",
+				"misc-compile-linuxarm",
 				"misc-compile-mips",
 				"misc-compile-netbsd",
 				"misc-compile-openbsd",
+				"misc-compile-other",
 				"misc-compile-plan9",
 				"misc-compile-ppc",
+				"misc-compile-solaris",
 				"openbsd-amd64-68",
 				"windows-386-2008",
 				"windows-amd64-2016",
@@ -149,6 +151,7 @@
 				"linux-386",
 				"linux-amd64",
 				"linux-amd64-race",
+				"linux-arm-aws",
 				"misc-compile-darwin",
 				"misc-compile-darwinarm64", // Starts with Go 1.16.
 				"misc-compile-freebsd",
@@ -180,6 +183,7 @@
 				"linux-386",
 				"linux-amd64",
 				"linux-amd64-race",
+				"linux-arm-aws",
 				"misc-compile-darwin",
 				"misc-compile-freebsd",
 				"misc-compile-linuxarm",
@@ -219,6 +223,7 @@
 				"linux-386",
 				"linux-amd64",
 				"linux-amd64-race",
+				"linux-arm-aws",
 				"netbsd-amd64-9_0",
 				"openbsd-386-68",
 				"openbsd-amd64-68",