Skip to content

Commit 1446634

Browse files
heschiheschi
committed
dashboard: clean up builders affected by memory corruption
Remove freebsd 12.2, which is replaced by 12.3 with the XSAVE fix. Move freebsd 11.* to N2 machines, which are not affected. Remove openbsd and netbsd e2/n1/n2/n2d-specific configurations now that we have mostly understood the nature of that problem. Keep one around so that the runtime team can create gomotes. Move the "official" builder to the n2 cpu that works. For golang/go#49967, golang/go#49209, golang/go#40561. Fixes golang/go#50496. Change-Id: If6989317f06cbec95d5addb19d9e968aecfa3f8a Reviewed-on: https://go-review.googlesource.com/c/build/+/377474 Trust: Heschi Kreinick <[email protected]> Run-TryBot: Heschi Kreinick <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> Reviewed-by: Alex Rakoczy <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 1d9ebe8 commit 1446634

File tree

4 files changed

+25
-249
lines changed

4 files changed

+25
-249
lines changed

‎cmd/release/release.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ var builds = []*Build{
177177
GoQuery: ">= go1.18beta1", // See #40561.
178178
OS: "freebsd",
179179
Arch: "386",
180-
Builder: "freebsd-386-12_2",
180+
Builder: "freebsd-386-12_3",
181181
},
182182
{
183183
GoQuery: ">= go1.18beta1", // See #40561.
184184
OS: "freebsd",
185185
Arch: "amd64",
186186
Race: true,
187-
Builder: "freebsd-amd64-12_2",
187+
Builder: "freebsd-amd64-12_3",
188188
},
189189
{
190190
GoQuery: ">= go1.17beta1 && < go1.18beta1", // See #45727.

‎cmd/release/release_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ func TestBuilderSelectionPerGoVersion(t *testing.T) {
115115
{"go1.17rc2", "freebsd-386", "freebsd-386-11_4"},
116116
{"go1.17", "freebsd-amd64", "freebsd-amd64-11_4"},
117117
{"go1.17", "freebsd-386", "freebsd-386-11_4"},
118-
// Go 1.18 use the the FreeBSD 12.2 builder.
119-
{"go1.18", "freebsd-amd64", "freebsd-amd64-12_2"},
120-
{"go1.18", "freebsd-386", "freebsd-386-12_2"},
118+
// Go 1.18 use the the FreeBSD 12.3 builder.
119+
{"go1.18", "freebsd-amd64", "freebsd-amd64-12_3"},
120+
{"go1.18", "freebsd-386", "freebsd-386-12_3"},
121121

122122
// macOS (amd64)
123123
// Go 1.16 uses MacOS 10.15.

‎dashboard/builders.go

Lines changed: 9 additions & 222 deletions
Original file line numberDiff line numberDiff line change
@@ -231,69 +231,29 @@ var Hosts = map[string]*HostConfig{
231231
},
232232
"host-openbsd-amd64-68": &HostConfig{
233233
VMImage: "openbsd-amd64-68-v3", // v3 adds 009_exit syspatch; see golang.org/cl/278732.
234-
machineType: "e2-highcpu-4",
234+
machineType: "n2-highcpu-4",
235235
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
236236
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
237237
Notes: "OpenBSD 6.8 (with 009_exit syspatch); GCE VM is built from script in build/env/openbsd-amd64",
238238
SSHUsername: "gopher",
239239
},
240240
"host-openbsd-386-68": &HostConfig{
241241
VMImage: "openbsd-386-68-v3", // v3 adds 009_exit syspatch; see golang.org/cl/278732.
242-
machineType: "e2-highcpu-4",
242+
machineType: "n2-highcpu-4",
243243
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
244244
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
245245
Notes: "OpenBSD 6.8 (with 009_exit syspatch); GCE VM is built from script in build/env/openbsd-386",
246246
SSHUsername: "gopher",
247247
},
248248
"host-openbsd-amd64-70": &HostConfig{
249-
VMImage: "openbsd-amd64-70",
250-
machineType: "e2-highcpu-4",
251-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
252-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
253-
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64",
254-
SSHUsername: "gopher",
255-
},
256-
"host-openbsd-amd64-70-n1": &HostConfig{
257-
VMImage: "openbsd-amd64-70",
258-
machineType: "n1-highcpu-4",
259-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
260-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
261-
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64. n1-highcpu host.",
262-
SSHUsername: "gopher",
263-
},
264-
"host-openbsd-amd64-70-n2": &HostConfig{
265249
VMImage: "openbsd-amd64-70",
266250
machineType: "n2-highcpu-4",
267251
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
268252
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
269253
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64. n2-highcpu host.",
270254
SSHUsername: "gopher",
271255
},
272-
"host-openbsd-amd64-70-n2d": &HostConfig{
273-
VMImage: "openbsd-amd64-70",
274-
machineType: "n2d-highcpu-4",
275-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
276-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
277-
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64. n2d-highcpu host.",
278-
SSHUsername: "gopher",
279-
},
280256
"host-openbsd-386-70": &HostConfig{
281-
VMImage: "openbsd-386-70",
282-
machineType: "e2-highcpu-4",
283-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
284-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
285-
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-386",
286-
SSHUsername: "gopher",
287-
},
288-
"host-openbsd-386-70-n1": &HostConfig{
289-
VMImage: "openbsd-386-70",
290-
machineType: "n1-highcpu-4",
291-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
292-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
293-
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-386. n1-highcpu host.",
294-
SSHUsername: "gopher",
295-
},
296-
"host-openbsd-386-70-n2": &HostConfig{
297257
VMImage: "openbsd-386-70",
298258
machineType: "n2-highcpu-4",
299259
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
@@ -302,6 +262,7 @@ var Hosts = map[string]*HostConfig{
302262
SSHUsername: "gopher",
303263
},
304264
"host-openbsd-386-70-n2d": &HostConfig{
265+
// This host config is only for the runtime team to use investigating golang/go#49209.
305266
VMImage: "openbsd-386-70",
306267
machineType: "n2d-highcpu-4",
307268
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
@@ -330,23 +291,15 @@ var Hosts = map[string]*HostConfig{
330291
"host-freebsd-11_2": &HostConfig{
331292
VMImage: "freebsd-amd64-112",
332293
Notes: "FreeBSD 11.2; GCE VM is built from script in build/env/freebsd-amd64",
333-
machineType: "e2-highcpu-4",
294+
machineType: "n2-highcpu-4",
334295
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
335296
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
336297
SSHUsername: "gopher",
337298
},
338299
"host-freebsd-11_4": &HostConfig{
339300
VMImage: "freebsd-amd64-114",
340301
Notes: "FreeBSD 11.4; GCE VM is built from script in build/env/freebsd-amd64",
341-
machineType: "e2-highcpu-4",
342-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
343-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
344-
SSHUsername: "gopher",
345-
},
346-
"host-freebsd-12_2": &HostConfig{
347-
VMImage: "freebsd-amd64-122",
348-
Notes: "FreeBSD 12.2; GCE VM is built from script in build/env/freebsd-amd64",
349-
machineType: "e2-highcpu-4",
302+
machineType: "n2-highcpu-4",
350303
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
351304
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
352305
SSHUsername: "gopher",
@@ -376,69 +329,21 @@ var Hosts = map[string]*HostConfig{
376329
SSHUsername: "gopher",
377330
},
378331
"host-netbsd-amd64-9_0": &HostConfig{
379-
VMImage: "netbsd-amd64-9-0-2019q4",
380-
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64",
381-
machineType: "e2-highcpu-4",
382-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-amd64",
383-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
384-
SSHUsername: "root",
385-
},
386-
"host-netbsd-amd64-9_0-n1": &HostConfig{
387-
VMImage: "netbsd-amd64-9-0-2019q4",
388-
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64. n1-highcpu host.",
389-
machineType: "n1-highcpu-4",
390-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-amd64",
391-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
392-
SSHUsername: "root",
393-
},
394-
"host-netbsd-amd64-9_0-n2": &HostConfig{
395332
VMImage: "netbsd-amd64-9-0-2019q4",
396333
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64. n2-highcpu host.",
397334
machineType: "n2-highcpu-4",
398335
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-amd64",
399336
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
400337
SSHUsername: "root",
401338
},
402-
"host-netbsd-amd64-9_0-n2d": &HostConfig{
403-
VMImage: "netbsd-amd64-9-0-2019q4",
404-
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64. n2d-highcpu host.",
405-
machineType: "n2d-highcpu-4",
406-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-amd64",
407-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
408-
SSHUsername: "root",
409-
},
410339
"host-netbsd-386-9_0": &HostConfig{
411-
VMImage: "netbsd-i386-9-0-2019q4",
412-
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386",
413-
machineType: "e2-highcpu-4",
414-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
415-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
416-
SSHUsername: "root",
417-
},
418-
"host-netbsd-386-9_0-n1": &HostConfig{
419-
VMImage: "netbsd-i386-9-0-2019q4",
420-
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386. n1-highcpu host.",
421-
machineType: "n1-highcpu-4",
422-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
423-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
424-
SSHUsername: "root",
425-
},
426-
"host-netbsd-386-9_0-n2": &HostConfig{
427340
VMImage: "netbsd-i386-9-0-2019q4",
428341
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386. n2-highcpu host.",
429342
machineType: "n2-highcpu-4",
430343
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
431344
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
432345
SSHUsername: "root",
433346
},
434-
"host-netbsd-386-9_0-n2d": &HostConfig{
435-
VMImage: "netbsd-i386-9-0-2019q4",
436-
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386. n2d-highcpu host.",
437-
machineType: "n2d-highcpu-4",
438-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
439-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
440-
SSHUsername: "root",
441-
},
442347
"host-netbsd-arm-bsiegert": &HostConfig{
443348
IsReverse: true,
444349
ExpectNum: 1,
@@ -1590,14 +1495,6 @@ func init() {
15901495
return atMostGo1(goBranch, 17) && buildRepoByDefault(repo)
15911496
},
15921497
})
1593-
addBuilder(BuildConfig{
1594-
Name: "freebsd-amd64-12_2",
1595-
HostType: "host-freebsd-12_2",
1596-
tryBot: defaultTrySet("sys"),
1597-
1598-
distTestAdjust: fasterTrybots, // If changing this policy, update TestShouldRunDistTest accordingly.
1599-
numTryTestHelpers: 4,
1600-
})
16011498
addBuilder(BuildConfig{
16021499
Name: "freebsd-amd64-12_3",
16031500
HostType: "host-freebsd-12_3",
@@ -1606,13 +1503,6 @@ func init() {
16061503
distTestAdjust: fasterTrybots, // If changing this policy, update TestShouldRunDistTest accordingly.
16071504
numTryTestHelpers: 4,
16081505
})
1609-
addBuilder(BuildConfig{
1610-
Name: "freebsd-386-12_2",
1611-
HostType: "host-freebsd-12_2",
1612-
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1613-
distTestAdjust: fasterTrybots,
1614-
numTryTestHelpers: 4,
1615-
})
16161506
addBuilder(BuildConfig{
16171507
Name: "freebsd-386-12_3",
16181508
HostType: "host-freebsd-12_3",
@@ -2120,38 +2010,6 @@ func init() {
21202010
},
21212011
numTryTestHelpers: 4,
21222012
})
2123-
addBuilder(BuildConfig{
2124-
Name: "openbsd-amd64-70-n1",
2125-
HostType: "host-openbsd-amd64-70-n1",
2126-
tryBot: defaultTrySet(),
2127-
distTestAdjust: noTestDirAndNoReboot,
2128-
buildsRepo: func(repo, branch, goBranch string) bool {
2129-
// https://github.com/golang/go/issues/48977#issuecomment-971763553:
2130-
// 1.16 seems to be incompatible with 7.0.
2131-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2132-
},
2133-
numTryTestHelpers: 4,
2134-
})
2135-
addBuilder(BuildConfig{
2136-
Name: "openbsd-amd64-70-n2",
2137-
HostType: "host-openbsd-amd64-70-n2",
2138-
distTestAdjust: noTestDirAndNoReboot,
2139-
buildsRepo: func(repo, branch, goBranch string) bool {
2140-
// https://github.com/golang/go/issues/48977#issuecomment-971763553:
2141-
// 1.16 seems to be incompatible with 7.0.
2142-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2143-
},
2144-
})
2145-
addBuilder(BuildConfig{
2146-
Name: "openbsd-amd64-70-n2d",
2147-
HostType: "host-openbsd-amd64-70-n2d",
2148-
distTestAdjust: noTestDirAndNoReboot,
2149-
buildsRepo: func(repo, branch, goBranch string) bool {
2150-
// https://github.com/golang/go/issues/48977#issuecomment-971763553:
2151-
// 1.16 seems to be incompatible with 7.0.
2152-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2153-
},
2154-
})
21552013
addBuilder(BuildConfig{
21562014
Name: "openbsd-386-70",
21572015
HostType: "host-openbsd-386-70",
@@ -2170,50 +2028,10 @@ func init() {
21702028
numTryTestHelpers: 4,
21712029
})
21722030
addBuilder(BuildConfig{
2173-
Name: "openbsd-386-70-n1",
2174-
HostType: "host-openbsd-386-70-n1",
2175-
tryBot: explicitTrySet("sys"),
2176-
buildsRepo: func(repo, branch, goBranch string) bool {
2177-
if repo == "review" {
2178-
// https://golang.org/issue/49529: git seems to be too slow on this
2179-
// platform.
2180-
return false
2181-
}
2182-
// https://github.com/golang/go/issues/48977#issuecomment-971763553:
2183-
// 1.16 seems to be incompatible with 7.0.
2184-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2185-
},
2186-
distTestAdjust: noTestDirAndNoReboot,
2187-
numTryTestHelpers: 4,
2188-
})
2189-
addBuilder(BuildConfig{
2190-
Name: "openbsd-386-70-n2",
2191-
HostType: "host-openbsd-386-70-n2",
2192-
buildsRepo: func(repo, branch, goBranch string) bool {
2193-
if repo == "review" {
2194-
// https://golang.org/issue/49529: git seems to be too slow on this
2195-
// platform.
2196-
return false
2197-
}
2198-
// https://github.com/golang/go/issues/48977#issuecomment-971763553:
2199-
// 1.16 seems to be incompatible with 7.0.
2200-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2201-
},
2202-
distTestAdjust: noTestDirAndNoReboot,
2203-
})
2204-
addBuilder(BuildConfig{
2205-
Name: "openbsd-386-70-n2d",
2206-
HostType: "host-openbsd-386-70-n2d",
2207-
buildsRepo: func(repo, branch, goBranch string) bool {
2208-
if repo == "review" {
2209-
// https://golang.org/issue/49529: git seems to be too slow on this
2210-
// platform.
2211-
return false
2212-
}
2213-
// https://github.com/golang/go/issues/48977#issuecomment-971763553:
2214-
// 1.16 seems to be incompatible with 7.0.
2215-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2216-
},
2031+
// This builder is only for the runtime team to use investigating golang/go#49209.
2032+
Name: "openbsd-386-70-n2d",
2033+
HostType: "host-openbsd-386-70-n2d",
2034+
buildsRepo: disabledBuilder,
22172035
distTestAdjust: noTestDirAndNoReboot,
22182036
})
22192037
addBuilder(BuildConfig{
@@ -2282,42 +2100,11 @@ func init() {
22822100
distTestAdjust: noTestDirAndNoReboot,
22832101
tryBot: explicitTrySet("sys"),
22842102
})
2285-
addBuilder(BuildConfig{
2286-
Name: "netbsd-amd64-9_0-n1",
2287-
HostType: "host-netbsd-amd64-9_0-n1",
2288-
distTestAdjust: noTestDirAndNoReboot,
2289-
tryBot: explicitTrySet("sys"),
2290-
})
2291-
addBuilder(BuildConfig{
2292-
Name: "netbsd-amd64-9_0-n2",
2293-
HostType: "host-netbsd-amd64-9_0-n2",
2294-
distTestAdjust: noTestDirAndNoReboot,
2295-
})
2296-
addBuilder(BuildConfig{
2297-
Name: "netbsd-amd64-9_0-n2d",
2298-
HostType: "host-netbsd-amd64-9_0-n2d",
2299-
distTestAdjust: noTestDirAndNoReboot,
2300-
})
23012103
addBuilder(BuildConfig{
23022104
Name: "netbsd-386-9_0",
23032105
HostType: "host-netbsd-386-9_0",
23042106
distTestAdjust: noTestDirAndNoReboot,
23052107
})
2306-
addBuilder(BuildConfig{
2307-
Name: "netbsd-386-9_0-n1",
2308-
HostType: "host-netbsd-386-9_0-n1",
2309-
distTestAdjust: noTestDirAndNoReboot,
2310-
})
2311-
addBuilder(BuildConfig{
2312-
Name: "netbsd-386-9_0-n2",
2313-
HostType: "host-netbsd-386-9_0-n2",
2314-
distTestAdjust: noTestDirAndNoReboot,
2315-
})
2316-
addBuilder(BuildConfig{
2317-
Name: "netbsd-386-9_0-n2d",
2318-
HostType: "host-netbsd-386-9_0-n2d",
2319-
distTestAdjust: noTestDirAndNoReboot,
2320-
})
23212108
addBuilder(BuildConfig{
23222109
Name: "netbsd-arm-bsiegert",
23232110
HostType: "host-netbsd-arm-bsiegert",

0 commit comments

Comments
 (0)