Skip to content

Commit 2ecf424

Browse files
cagedmantiscagedmantis
committed
dashboard: make FreeBSD 11.4 and 12.2 builders the default
With this change: - The default FreeBSD builders used on master are 11.4 and 12.2. - The FreeBSD 12.0 builders have been removed. - The FreeBSD 11.2 builders have been set to run on at most Go 1.16. They will continue to be used for Go 1.16.x and 1.15.x minor releases. - The freebsd-amd64-race builder has been updated to use the FreeBSD 12.2 host. - The slowbot aliases for FreeBSD have been updated to use 12.2. Fixes golang/go#44431 Update golang/go#45727 Update golang/go#40561 Change-Id: Ib558fca65c2de1916b4633711d3e320c390bd2b2 Reviewed-on: https://go-review.googlesource.com/c/build/+/313070 Trust: Carlos Amedee <[email protected]> Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent d398daf commit 2ecf424

File tree

2 files changed

+57
-55
lines changed

2 files changed

+57
-55
lines changed

‎dashboard/builders.go

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ var slowBotAliases = map[string]string{
4343
"darwin-arm64": "darwin-arm64-11_0-toothrot",
4444
"ios-arm64": "ios-arm64-corellium",
4545
"dragonfly": "dragonfly-amd64",
46-
"freebsd": "freebsd-amd64-12_0",
47-
"freebsd-386": "freebsd-386-12_0",
48-
"freebsd-amd64": "freebsd-amd64-12_0",
46+
"freebsd": "freebsd-amd64-12_2",
47+
"freebsd-386": "freebsd-386-12_2",
48+
"freebsd-amd64": "freebsd-amd64-12_2",
4949
"freebsd-arm": "freebsd-arm-paulzhol",
5050
"freebsd-arm64": "freebsd-arm64-dmgk",
5151
"illumos": "illumos-amd64",
@@ -315,14 +315,6 @@ var Hosts = map[string]*HostConfig{
315315
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
316316
SSHUsername: "gopher",
317317
},
318-
"host-freebsd-12_0": &HostConfig{
319-
VMImage: "freebsd-amd64-120-v1",
320-
Notes: "FreeBSD 12.0; GCE VM is built from script in build/env/freebsd-amd64",
321-
machineType: "n1-highcpu-4",
322-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
323-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
324-
SSHUsername: "gopher",
325-
},
326318
"host-freebsd-12_2": &HostConfig{
327319
VMImage: "freebsd-amd64-122",
328320
Notes: "FreeBSD 12.2; GCE VM is built from script in build/env/freebsd-amd64",
@@ -331,9 +323,9 @@ var Hosts = map[string]*HostConfig{
331323
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
332324
SSHUsername: "gopher",
333325
},
334-
"host-freebsd-12_0-big": &HostConfig{
335-
VMImage: "freebsd-amd64-120-v1",
336-
Notes: "Same as host-freebsd-12_0, but on n1-highcpu-16",
326+
"host-freebsd-12_2-big": &HostConfig{
327+
VMImage: "freebsd-amd64-122",
328+
Notes: "Same as host-freebsd-12_2, but on n1-highcpu-16",
337329
machineType: "n1-highcpu-16", // 16 vCPUs, 14.4 GB mem
338330
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
339331
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
@@ -1493,59 +1485,58 @@ func init() {
14931485
tryBot: explicitTrySet("sys"),
14941486
distTestAdjust: fasterTrybots,
14951487
numTryTestHelpers: 4,
1488+
buildsRepo: func(repo, branch, goBranch string) bool {
1489+
// This builder is still used by Go 1.16 and 1.15,
1490+
// so keep it around a bit longer. See golang.org/issue/45727.
1491+
// Test relevant Go versions so that we're better informed.
1492+
return atMostGo1(goBranch, 16) && buildRepoByDefault(repo)
1493+
},
14961494
})
14971495
addBuilder(BuildConfig{
14981496
Name: "freebsd-amd64-11_4",
14991497
HostType: "host-freebsd-11_4",
1498+
tryBot: explicitTrySet("sys"),
1499+
distTestAdjust: fasterTrybots,
15001500
numTryTestHelpers: 4,
1501-
KnownIssue: 44431,
15021501
})
15031502
addBuilder(BuildConfig{
1504-
Name: "freebsd-amd64-12_0",
1505-
HostType: "host-freebsd-12_0",
1506-
MinimumGoVersion: types.MajorMinor{1, 11},
1507-
tryBot: defaultTrySet("sys"),
1503+
Name: "freebsd-amd64-12_2",
1504+
HostType: "host-freebsd-12_2",
1505+
tryBot: defaultTrySet("sys"),
15081506

15091507
distTestAdjust: fasterTrybots, // If changing this policy, update TestShouldRunDistTest accordingly.
15101508
numTryTestHelpers: 4,
15111509
})
1512-
addBuilder(BuildConfig{
1513-
Name: "freebsd-amd64-12_2",
1514-
HostType: "host-freebsd-12_2",
1515-
numTryTestHelpers: 4,
1516-
KnownIssue: 44431,
1517-
})
1518-
addBuilder(BuildConfig{
1519-
Name: "freebsd-386-12_0",
1520-
HostType: "host-freebsd-12_0",
1521-
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1522-
distTestAdjust: fasterTrybots,
1523-
numTryTestHelpers: 4,
1524-
})
15251510
addBuilder(BuildConfig{
15261511
Name: "freebsd-386-12_2",
15271512
HostType: "host-freebsd-12_2",
15281513
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1514+
distTestAdjust: fasterTrybots,
15291515
numTryTestHelpers: 4,
1530-
KnownIssue: 44431,
15311516
})
15321517
addBuilder(BuildConfig{
15331518
Name: "freebsd-amd64-race",
1534-
HostType: "host-freebsd-12_0-big",
1519+
HostType: "host-freebsd-12_2-big",
15351520
})
15361521
addBuilder(BuildConfig{
15371522
Name: "freebsd-386-11_2",
15381523
HostType: "host-freebsd-11_2",
15391524
distTestAdjust: noTestDirAndNoReboot,
15401525
tryBot: explicitTrySet("sys"),
15411526
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1527+
buildsRepo: func(repo, branch, goBranch string) bool {
1528+
// This builder is still used by Go 1.16 and 1.15,
1529+
// so keep it around a bit longer. See golang.org/issue/45727.
1530+
// Test relevant Go versions so that we're better informed.
1531+
return atMostGo1(goBranch, 16) && buildRepoByDefault(repo)
1532+
},
15421533
})
15431534
addBuilder(BuildConfig{
15441535
Name: "freebsd-386-11_4",
15451536
HostType: "host-freebsd-11_4",
15461537
distTestAdjust: noTestDirAndNoReboot,
1538+
tryBot: explicitTrySet("sys"),
15471539
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1548-
KnownIssue: 44431,
15491540
})
15501541
addBuilder(BuildConfig{
15511542
Name: "linux-386",

‎dashboard/builders_test.go

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestTrybots(t *testing.T) {
9292
branch: "master",
9393
want: []string{
9494
"android-amd64-emu",
95-
"freebsd-amd64-12_0",
95+
"freebsd-amd64-12_2",
9696
"js-wasm",
9797
"linux-386",
9898
"linux-amd64",
@@ -120,7 +120,7 @@ func TestTrybots(t *testing.T) {
120120
branch: "dev.link",
121121
want: []string{
122122
"android-amd64-emu",
123-
"freebsd-amd64-12_0",
123+
"freebsd-amd64-12_2",
124124
"js-wasm",
125125
"linux-386",
126126
"linux-amd64",
@@ -148,7 +148,7 @@ func TestTrybots(t *testing.T) {
148148
branch: "release-branch.go1.16",
149149
want: []string{
150150
"android-amd64-emu",
151-
"freebsd-amd64-12_0",
151+
"freebsd-amd64-12_2",
152152
"js-wasm",
153153
"linux-386",
154154
"linux-amd64",
@@ -181,7 +181,7 @@ func TestTrybots(t *testing.T) {
181181
branch: "release-branch.go1.15",
182182
want: []string{
183183
"android-amd64-emu",
184-
"freebsd-amd64-12_0",
184+
"freebsd-amd64-12_2",
185185
"js-wasm",
186186
"linux-386",
187187
"linux-amd64",
@@ -221,9 +221,9 @@ func TestTrybots(t *testing.T) {
221221
branch: "master",
222222
want: []string{
223223
"android-amd64-emu",
224-
"freebsd-386-11_2",
225-
"freebsd-amd64-11_2",
226-
"freebsd-amd64-12_0",
224+
"freebsd-386-11_4",
225+
"freebsd-amd64-11_4",
226+
"freebsd-amd64-12_2",
227227
"linux-386",
228228
"linux-amd64",
229229
"linux-amd64-race",
@@ -416,13 +416,24 @@ func TestBuilderConfig(t *testing.T) {
416416
{b("[email protected]", "go"), onlyPost},
417417
{b("[email protected]", "go"), onlyPost},
418418

419-
// FreeBSD 12.0
420-
{b("freebsd-amd64-12_0", "go"), both},
421-
{b("freebsd-amd64-12_0", "net"), both},
422-
{b("freebsd-amd64-12_0", "mobile"), none},
423-
{b("freebsd-386-12_0", "go"), onlyPost},
424-
{b("freebsd-386-12_0", "net"), onlyPost},
425-
{b("freebsd-386-12_0", "mobile"), none},
419+
// FreeBSD 12.2
420+
{b("freebsd-amd64-12_2", "go"), both},
421+
{b("freebsd-amd64-12_2", "net"), both},
422+
{b("freebsd-amd64-12_2", "mobile"), none},
423+
{b("freebsd-386-12_2", "go"), onlyPost},
424+
{b("freebsd-386-12_2", "net"), onlyPost},
425+
{b("freebsd-386-12_2", "mobile"), none},
426+
427+
// FreeBSD 11.2
428+
// See golang.org/issue/45727
429+
{b("[email protected]", "go"), isBuilder},
430+
{b("[email protected]", "net"), onlyPost},
431+
{b("[email protected]", "sys"), both},
432+
{b("freebsd-amd64-11_2", "go"), none},
433+
{b("[email protected]", "go"), isBuilder},
434+
{b("[email protected]", "net"), onlyPost},
435+
{b("[email protected]", "sys"), both},
436+
{b("freebsd-386-11_2", "go"), none},
426437

427438
// NetBSD
428439
{b("netbsd-amd64-9_0", "go"), onlyPost},
@@ -516,10 +527,10 @@ func TestBuilderConfig(t *testing.T) {
516527
{b("darwin-amd64-10_15", "exp"), onlyPost},
517528
// ... but not on most others:
518529
{b("darwin-amd64-10_12", "exp"), none},
519-
{b("freebsd-386-11_2", "exp"), none},
520-
{b("freebsd-386-12_0", "exp"), none},
521-
{b("freebsd-amd64-11_2", "exp"), none},
522-
{b("freebsd-amd64-12_0", "exp"), none},
530+
{b("freebsd-386-11_4", "exp"), none},
531+
{b("freebsd-386-12_2", "exp"), none},
532+
{b("freebsd-amd64-11_4", "exp"), none},
533+
{b("freebsd-amd64-12_2", "exp"), none},
523534
{b("openbsd-amd64-64", "exp"), none},
524535
{b("openbsd-amd64-68", "exp"), none},
525536
{b("js-wasm", "exp"), none},
@@ -671,8 +682,8 @@ func TestShouldRunDistTest(t *testing.T) {
671682
}{
672683
{"linux-amd64", "api", postSubmit, true},
673684
{"linux-amd64", "api", tryMode, true},
674-
{"freebsd-amd64-12_0", "api", postSubmit, true}, // freebsd-amd64-12_0 uses fasterTrybots policy, should still build.
675-
{"freebsd-amd64-12_0", "api", tryMode, false}, // freebsd-amd64-12_0 uses fasterTrybots policy, should skip in try mode.
685+
{"freebsd-amd64-12_2", "api", postSubmit, true}, // freebsd-amd64-12_2 uses fasterTrybots policy, should still build.
686+
{"freebsd-amd64-12_2", "api", tryMode, false}, // freebsd-amd64-12_2 uses fasterTrybots policy, should skip in try mode.
676687

677688
{"linux-amd64", "reboot", tryMode, true},
678689
{"linux-amd64-race", "reboot", tryMode, false},

0 commit comments

Comments
 (0)