dashboard: add linux-arm64-aws to set of trybots
This change adds linux-arm64-aws to the set of trybots. It also
removes linux-arm and linux-arm64 from the list of builds attempted in
the misc-compile-linuxarm builder.
Updates golang/go#36170
Fixes golang/go#45065
Change-Id: If25fed08e35b2a91c9c9dbbf31701ff5464dc913
Reviewed-on: https://go-review.googlesource.com/c/build/+/303232
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/coordinator/coordinator_test.go b/cmd/coordinator/coordinator_test.go
index dd4ea7a..52442fc 100644
--- a/cmd/coordinator/coordinator_test.go
+++ b/cmd/coordinator/coordinator_test.go
@@ -324,7 +324,7 @@
for _, bc := range slowBots {
got = append(got, bc.Name)
}
- want := []string{"aix-ppc64", "darwin-amd64-10_14", "linux-arm64-packet"}
+ want := []string{"aix-ppc64", "darwin-amd64-10_14", "linux-arm64-aws"}
if !reflect.DeepEqual(got, want) {
t.Errorf("mismatch:\n got: %q\nwant: %q\n", got, want)
}
diff --git a/dashboard/builders.go b/dashboard/builders.go
index ec0bf6e..7b1a285 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -37,7 +37,7 @@
"android-arm": "android-arm-corellium",
"android-arm64": "android-arm64-corellium",
"arm": "linux-arm-aws",
- "arm64": "linux-arm64-packet",
+ "arm64": "linux-arm64-aws",
"darwin": "darwin-amd64-10_14",
"darwin-amd64": "darwin-amd64-10_14",
"darwin-arm64": "darwin-arm64-11_0-toothrot",
@@ -53,7 +53,7 @@
"js": "js-wasm",
"linux": "linux-amd64",
"linux-arm": "linux-arm-aws",
- "linux-arm64": "linux-arm64-packet",
+ "linux-arm64": "linux-arm64-aws",
"linux-mips": "linux-mips-rtrk",
"linux-mips64": "linux-mips64-rtrk",
"linux-mips64le": "linux-mips64le-mengzhuo",
@@ -1600,7 +1600,7 @@
// for all supported Go versions.
addMiscCompile := func(suffix, rx string) { addMiscCompileGo1(0, suffix, rx) }
- addMiscCompile("-linuxarm", "^linux-arm") // 2: arm, arm64
+ addMiscCompile("-linuxarm", "^linux-arm-arm5$") // 1: linux/arm with GOARM=5
addMiscCompile("-darwin", "^darwin-(386|amd64)$") // 1: amd64
addMiscCompileGo1(16, "-darwinarm64", "^darwin-arm64$") // 1: arm64 (for Go 1.16 and newer)
addMiscCompile("-mips", "^linux-mips") // 4: mips, mipsle, mips64, mips64le
@@ -2410,8 +2410,10 @@
FlakyNet: true, // maybe not flaky, but here conservatively
})
addBuilder(BuildConfig{
- Name: "linux-arm64-aws",
- HostType: "host-linux-arm64-aws",
+ Name: "linux-arm64-aws",
+ HostType: "host-linux-arm64-aws",
+ tryBot: defaultTrySet(),
+ numTryTestHelpers: 1,
})
addBuilder(BuildConfig{
Name: "linux-arm-aws",
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 4ab4c5d..15ee139 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -98,6 +98,7 @@
"linux-amd64",
"linux-amd64-race",
"linux-arm-aws",
+ "linux-arm64-aws",
"misc-compile-darwin",
"misc-compile-darwinarm64",
"misc-compile-freebsd",
@@ -125,6 +126,7 @@
"linux-amd64",
"linux-amd64-race",
"linux-arm-aws",
+ "linux-arm64-aws",
"misc-compile-darwin",
"misc-compile-darwinarm64",
"misc-compile-freebsd",
@@ -152,6 +154,7 @@
"linux-amd64",
"linux-amd64-race",
"linux-arm-aws",
+ "linux-arm64-aws",
"misc-compile-darwin",
"misc-compile-darwinarm64", // Starts with Go 1.16.
"misc-compile-freebsd",
@@ -184,6 +187,7 @@
"linux-amd64",
"linux-amd64-race",
"linux-arm-aws",
+ "linux-arm64-aws",
"misc-compile-darwin",
"misc-compile-freebsd",
"misc-compile-linuxarm",
@@ -224,6 +228,7 @@
"linux-amd64",
"linux-amd64-race",
"linux-arm-aws",
+ "linux-arm64-aws",
"netbsd-amd64-9_0",
"openbsd-386-68",
"openbsd-amd64-68",
