Skip to content

Commit 34b0d64

Browse files
committed
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>
1 parent c1822c7 commit 34b0d64

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

cmd/coordinator/coordinator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func TestSlowBotsFromComments(t *testing.T) {
324324
for _, bc := range slowBots {
325325
got = append(got, bc.Name)
326326
}
327-
want := []string{"aix-ppc64", "darwin-amd64-10_14", "linux-arm64-packet"}
327+
want := []string{"aix-ppc64", "darwin-amd64-10_14", "linux-arm64-aws"}
328328
if !reflect.DeepEqual(got, want) {
329329
t.Errorf("mismatch:\n got: %q\nwant: %q\n", got, want)
330330
}

dashboard/builders.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var slowBotAliases = map[string]string{
3737
"android-arm": "android-arm-corellium",
3838
"android-arm64": "android-arm64-corellium",
3939
"arm": "linux-arm-aws",
40-
"arm64": "linux-arm64-packet",
40+
"arm64": "linux-arm64-aws",
4141
"darwin": "darwin-amd64-10_14",
4242
"darwin-amd64": "darwin-amd64-10_14",
4343
"darwin-arm64": "darwin-arm64-11_0-toothrot",
@@ -53,7 +53,7 @@ var slowBotAliases = map[string]string{
5353
"js": "js-wasm",
5454
"linux": "linux-amd64",
5555
"linux-arm": "linux-arm-aws",
56-
"linux-arm64": "linux-arm64-packet",
56+
"linux-arm64": "linux-arm64-aws",
5757
"linux-mips": "linux-mips-rtrk",
5858
"linux-mips64": "linux-mips64-rtrk",
5959
"linux-mips64le": "linux-mips64le-mengzhuo",
@@ -1600,7 +1600,7 @@ func init() {
16001600
// for all supported Go versions.
16011601
addMiscCompile := func(suffix, rx string) { addMiscCompileGo1(0, suffix, rx) }
16021602

1603-
addMiscCompile("-linuxarm", "^linux-arm") // 2: arm, arm64
1603+
addMiscCompile("-linuxarm", "^linux-arm-arm5$") // 1: linux/arm with GOARM=5
16041604
addMiscCompile("-darwin", "^darwin-(386|amd64)$") // 1: amd64
16051605
addMiscCompileGo1(16, "-darwinarm64", "^darwin-arm64$") // 1: arm64 (for Go 1.16 and newer)
16061606
addMiscCompile("-mips", "^linux-mips") // 4: mips, mipsle, mips64, mips64le
@@ -2410,8 +2410,10 @@ func init() {
24102410
FlakyNet: true, // maybe not flaky, but here conservatively
24112411
})
24122412
addBuilder(BuildConfig{
2413-
Name: "linux-arm64-aws",
2414-
HostType: "host-linux-arm64-aws",
2413+
Name: "linux-arm64-aws",
2414+
HostType: "host-linux-arm64-aws",
2415+
tryBot: defaultTrySet(),
2416+
numTryTestHelpers: 1,
24152417
})
24162418
addBuilder(BuildConfig{
24172419
Name: "linux-arm-aws",

dashboard/builders_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ func TestTrybots(t *testing.T) {
9898
"linux-amd64",
9999
"linux-amd64-race",
100100
"linux-arm-aws",
101+
"linux-arm64-aws",
101102
"misc-compile-darwin",
102103
"misc-compile-darwinarm64",
103104
"misc-compile-freebsd",
@@ -125,6 +126,7 @@ func TestTrybots(t *testing.T) {
125126
"linux-amd64",
126127
"linux-amd64-race",
127128
"linux-arm-aws",
129+
"linux-arm64-aws",
128130
"misc-compile-darwin",
129131
"misc-compile-darwinarm64",
130132
"misc-compile-freebsd",
@@ -152,6 +154,7 @@ func TestTrybots(t *testing.T) {
152154
"linux-amd64",
153155
"linux-amd64-race",
154156
"linux-arm-aws",
157+
"linux-arm64-aws",
155158
"misc-compile-darwin",
156159
"misc-compile-darwinarm64", // Starts with Go 1.16.
157160
"misc-compile-freebsd",
@@ -184,6 +187,7 @@ func TestTrybots(t *testing.T) {
184187
"linux-amd64",
185188
"linux-amd64-race",
186189
"linux-arm-aws",
190+
"linux-arm64-aws",
187191
"misc-compile-darwin",
188192
"misc-compile-freebsd",
189193
"misc-compile-linuxarm",
@@ -224,6 +228,7 @@ func TestTrybots(t *testing.T) {
224228
"linux-amd64",
225229
"linux-amd64-race",
226230
"linux-arm-aws",
231+
"linux-arm64-aws",
227232
"netbsd-amd64-9_0",
228233
"openbsd-386-68",
229234
"openbsd-amd64-68",

0 commit comments

Comments
 (0)