Skip to content

Commit c1822c7

Browse files
cagedmantiscagedmantis
committed
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>
1 parent 7701995 commit c1822c7

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

‎cmd/release/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ var builds = []*Build{
241241
GoQuery: "< go1.16beta1",
242242
OS: "linux",
243243
Arch: "arm",
244-
Builder: "linux-arm",
244+
Builder: "linux-arm-scaleway",
245245
Goarm: 6, // For compatibility with all Raspberry Pi models.
246246
// The tests take too long for the release packaging.
247247
// Much of the time the whole buildlet times out.

‎cmd/release/release_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestBuilderSelectionPerGoVersion(t *testing.T) {
8989
{"go1.16", "linux-386", "linux-386-stretch"},
9090

9191
// Go 1.15.x still uses the Packet and Scaleway builders.
92-
{"go1.15.55", "linux-armv6l", "linux-arm"},
92+
{"go1.15.55", "linux-armv6l", "linux-arm-scaleway"},
9393
// Go 1.16 starts to use the the AWS builders.
9494
{"go1.16", "linux-arm64", "linux-arm64-aws"},
9595
{"go1.16", "linux-armv6l", "linux-arm-aws"},

‎dashboard/builders.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var slowBotAliases = map[string]string{
3636
"android-amd64": "android-amd64-emu",
3737
"android-arm": "android-arm-corellium",
3838
"android-arm64": "android-arm64-corellium",
39-
"arm": "linux-arm",
39+
"arm": "linux-arm-aws",
4040
"arm64": "linux-arm64-packet",
4141
"darwin": "darwin-amd64-10_14",
4242
"darwin-amd64": "darwin-amd64-10_14",
@@ -52,6 +52,7 @@ var slowBotAliases = map[string]string{
5252
"ios": "ios-arm64-corellium",
5353
"js": "js-wasm",
5454
"linux": "linux-amd64",
55+
"linux-arm": "linux-arm-aws",
5556
"linux-arm64": "linux-arm64-packet",
5657
"linux-mips": "linux-mips-rtrk",
5758
"linux-mips64": "linux-mips64-rtrk",
@@ -1899,7 +1900,7 @@ func init() {
18991900
numTryTestHelpers: 4, // Target time is < 15 min for golang.org/issue/42661.
19001901
})
19011902
addBuilder(BuildConfig{
1902-
Name: "linux-arm",
1903+
Name: "linux-arm-scaleway",
19031904
HostType: "host-linux-arm-scaleway",
19041905
CrossCompileConfig: &CrossCompileConfig{
19051906
CompileHostType: "host-linux-armhf-cross",
@@ -2413,8 +2414,10 @@ func init() {
24132414
HostType: "host-linux-arm64-aws",
24142415
})
24152416
addBuilder(BuildConfig{
2416-
Name: "linux-arm-aws",
2417-
HostType: "host-linux-arm-aws",
2417+
Name: "linux-arm-aws",
2418+
HostType: "host-linux-arm-aws",
2419+
tryBot: defaultTrySet(),
2420+
numTryTestHelpers: 1,
24182421
})
24192422
addBuilder(BuildConfig{
24202423
FlakyNet: true,

‎dashboard/builders_test.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,18 @@ func TestTrybots(t *testing.T) {
9797
"linux-386",
9898
"linux-amd64",
9999
"linux-amd64-race",
100-
"misc-compile-other",
100+
"linux-arm-aws",
101101
"misc-compile-darwin",
102102
"misc-compile-darwinarm64",
103-
"misc-compile-linuxarm",
104-
"misc-compile-solaris",
105103
"misc-compile-freebsd",
104+
"misc-compile-linuxarm",
106105
"misc-compile-mips",
107106
"misc-compile-netbsd",
108107
"misc-compile-openbsd",
108+
"misc-compile-other",
109109
"misc-compile-plan9",
110110
"misc-compile-ppc",
111+
"misc-compile-solaris",
111112
"openbsd-amd64-68",
112113
"windows-386-2008",
113114
"windows-amd64-2016",
@@ -123,17 +124,18 @@ func TestTrybots(t *testing.T) {
123124
"linux-386",
124125
"linux-amd64",
125126
"linux-amd64-race",
126-
"misc-compile-other",
127+
"linux-arm-aws",
127128
"misc-compile-darwin",
128129
"misc-compile-darwinarm64",
129-
"misc-compile-linuxarm",
130-
"misc-compile-solaris",
131130
"misc-compile-freebsd",
131+
"misc-compile-linuxarm",
132132
"misc-compile-mips",
133133
"misc-compile-netbsd",
134134
"misc-compile-openbsd",
135+
"misc-compile-other",
135136
"misc-compile-plan9",
136137
"misc-compile-ppc",
138+
"misc-compile-solaris",
137139
"openbsd-amd64-68",
138140
"windows-386-2008",
139141
"windows-amd64-2016",
@@ -149,6 +151,7 @@ func TestTrybots(t *testing.T) {
149151
"linux-386",
150152
"linux-amd64",
151153
"linux-amd64-race",
154+
"linux-arm-aws",
152155
"misc-compile-darwin",
153156
"misc-compile-darwinarm64", // Starts with Go 1.16.
154157
"misc-compile-freebsd",
@@ -180,6 +183,7 @@ func TestTrybots(t *testing.T) {
180183
"linux-386",
181184
"linux-amd64",
182185
"linux-amd64-race",
186+
"linux-arm-aws",
183187
"misc-compile-darwin",
184188
"misc-compile-freebsd",
185189
"misc-compile-linuxarm",
@@ -219,6 +223,7 @@ func TestTrybots(t *testing.T) {
219223
"linux-386",
220224
"linux-amd64",
221225
"linux-amd64-race",
226+
"linux-arm-aws",
222227
"netbsd-amd64-9_0",
223228
"openbsd-386-68",
224229
"openbsd-amd64-68",

0 commit comments

Comments
 (0)