Skip to content

Commit 4f529e2

Browse files
committed
all: replace linux-arm64-aws with linux-arm64
This change replaces linux-arm64-aws with linux-arm64. The new builder runs on GCP and has an increased set of resources. This should provide a performance improvement. The builder will now be used: - To release linux-arm64 - As the linux-arm64 trybot Fixes golang/go#53851 Updates golang/go#54679 Updates golang/go#40561 Change-Id: I9abfe2ed1d1bd8a68bba1e1f924637e829026e6d Reviewed-on: https://go-review.googlesource.com/c/build/+/449615 Reviewed-by: Dmitri Shuralyov <[email protected]> Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Jenny Rakoczy <[email protected]>
1 parent b45bd2f commit 4f529e2

File tree

6 files changed

+21
-23
lines changed

6 files changed

+21
-23
lines changed

cmd/coordinator/coordinator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func TestSlowBotsFromComments(t *testing.T) {
344344
for _, bc := range slowBots {
345345
got = append(got, bc.Name)
346346
}
347-
want := []string{"aix-ppc64", "darwin-amd64-12_0", "linux-arm64-aws"}
347+
want := []string{"aix-ppc64", "darwin-amd64-12_0", "linux-arm64"}
348348
if !reflect.DeepEqual(got, want) {
349349
t.Errorf("mismatch:\n got: %q\nwant: %q\n", got, want)
350350
}

cmd/racebuild/racebuild.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ popd
195195
&Platform{
196196
OS: "linux",
197197
Arch: "arm64",
198-
Type: "linux-arm64-aws",
198+
Type: "linux-arm64",
199199
Script: `#!/usr/bin/env bash
200200
set -e
201201
apt-get update

dashboard/builders.go

Lines changed: 7 additions & 9 deletions
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-aws",
40+
"arm64": "linux-arm64",
4141
"darwin": "darwin-amd64-12_0",
4242
"darwin-amd64": "darwin-amd64-12_0",
4343
"darwin-arm64": "darwin-arm64-12",
@@ -55,7 +55,6 @@ var slowBotAliases = map[string]string{
5555
"js": "js-wasm",
5656
"linux": "linux-amd64",
5757
"linux-arm": "linux-arm-aws",
58-
"linux-arm64": "linux-arm64-aws",
5958
"linux-loong64": "linux-loong64-3a5000",
6059
"linux-mips": "linux-mips-rtrk",
6160
"linux-mips64": "linux-mips64-rtrk",
@@ -2583,15 +2582,14 @@ func init() {
25832582
env: []string{"GO_TEST_TIMEOUT_SCALE=2"}, // see go.dev/issues/44422
25842583
})
25852584
addBuilder(BuildConfig{
2586-
Name: "linux-arm64-aws",
2587-
HostType: "host-linux-arm64-aws",
2588-
tryBot: defaultTrySet(),
2589-
numTryTestHelpers: 1,
2585+
Name: "linux-arm64-aws",
2586+
HostType: "host-linux-arm64-aws",
25902587
})
25912588
addBuilder(BuildConfig{
2592-
Name: "linux-arm64",
2593-
HostType: "host-linux-arm64-bullseye",
2594-
KnownIssues: []int{53851},
2589+
Name: "linux-arm64",
2590+
HostType: "host-linux-arm64-bullseye",
2591+
tryBot: defaultTrySet(),
2592+
numTryTestHelpers: 1,
25952593
})
25962594
addBuilder(BuildConfig{
25972595
Name: "linux-arm64-boringcrypto",

dashboard/builders_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ func TestTrybots(t *testing.T) {
9898
"linux-386",
9999
"linux-amd64",
100100
"linux-amd64-boringcrypto",
101+
"linux-amd64-nounified",
101102
"linux-amd64-race",
102103
"linux-amd64-unified",
103-
"linux-amd64-nounified",
104104
"linux-arm-aws",
105-
"linux-arm64-aws",
105+
"linux-arm64",
106106
"openbsd-amd64-70",
107107
"windows-386-2008",
108108
"windows-386-2012",
@@ -135,7 +135,7 @@ func TestTrybots(t *testing.T) {
135135
"linux-amd64",
136136
"linux-amd64-race",
137137
"linux-arm-aws",
138-
"linux-arm64-aws",
138+
"linux-arm64",
139139
"openbsd-amd64-70",
140140
"windows-386-2008",
141141
"windows-386-2012",
@@ -173,7 +173,7 @@ func TestTrybots(t *testing.T) {
173173
"linux-amd64",
174174
"linux-amd64-race",
175175
"linux-arm-aws",
176-
"linux-arm64-aws",
176+
"linux-arm64",
177177
"openbsd-amd64-70",
178178
"windows-386-2008",
179179
"windows-386-2012",
@@ -221,7 +221,7 @@ func TestTrybots(t *testing.T) {
221221
"linux-amd64-boringcrypto", // GoDeps will exclude, but not in test
222222
"linux-amd64-race",
223223
"linux-arm-aws",
224-
"linux-arm64-aws",
224+
"linux-arm64",
225225
"netbsd-amd64-9_3",
226226
"openbsd-386-70",
227227
"openbsd-amd64-70",

internal/releasetargets/releases.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ linux-amd64 linux amd64 linux-amd64-stretch
2424
Race enabled, Long tests on linux-amd64-longtest
2525
Running on GCP
2626

27-
linux-arm64 linux arm64 linux-arm64-aws
28-
Running on AWS
27+
linux-arm64 linux arm64 linux-arm64
28+
Running on GCP
2929

3030
linux-armv6l linux arm linux-arm-aws
3131
Running on AWS
@@ -76,8 +76,8 @@ linux-amd64 linux amd64 linux-amd64-buster
7676
Race enabled, Long tests on linux-amd64-longtest
7777
Running on GCP
7878

79-
linux-arm64 linux arm64 linux-arm64-aws
80-
Running on AWS
79+
linux-arm64 linux arm64 linux-arm64
80+
Running on GCP
8181

8282
linux-armv6l linux arm linux-arm-aws
8383
Running on AWS
@@ -125,8 +125,8 @@ linux-amd64 linux amd64 linux-amd64-bullseye
125125
Long tests on linux-amd64-longtest
126126
Running on GCP
127127

128-
linux-arm64 linux arm64 linux-arm64-aws
129-
Running on AWS
128+
linux-arm64 linux arm64 linux-arm64
129+
Running on GCP
130130

131131
linux-armv6l linux arm linux-arm-aws
132132
Running on AWS

internal/releasetargets/releasetargets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var allReleases = map[int]ReleaseTargets{
7777
Builder: "linux-arm-aws",
7878
},
7979
"linux-arm64": &Target{
80-
Builder: "linux-arm64-aws",
80+
Builder: "linux-arm64",
8181
},
8282
"linux-amd64": &Target{
8383
Builder: "linux-amd64-stretch",

0 commit comments

Comments
 (0)