Skip to content

Commit 0768812

Browse files
committed
dashboard: remove obsolete disabled builders
FreeBSD 9.3, FreeBSD 10.x, and OpenBSD 6.0 have reached end-of-life and are no longer supported. Go 1.12 was the last release¹ that ran on FreeBSD 10.x. Go 1.10 was the last release² that ran on OpenBSD 6.0. These builders have long since been disabled and won't be needed in the future, so remove them. This work helped detect golang/go#40563. Modify TestHostConfigsAllUsed to report errors instead of warnings when it finds unused host configs. Make a map of known exceptions with rationale or a linked issue for each entry. ¹ https://golang.org/doc/go1.12#ports ² https://golang.org/doc/go1.10#ports Updates golang/go#36841. Updates golang/go#19938. Change-Id: Id7fcdc671bfacf7e70174f4168c9c9cc46ba53d7 Reviewed-on: https://go-review.googlesource.com/c/build/+/246639 Reviewed-by: Alexander Rakoczy <[email protected]>
1 parent f08b3ea commit 0768812

File tree

2 files changed

+21
-126
lines changed

2 files changed

+21
-126
lines changed

dashboard/builders.go

Lines changed: 2 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -223,24 +223,6 @@ var Hosts = map[string]*HostConfig{
223223
OwnerGithub: "bradfitz", // at home
224224
env: []string{"GOROOT_BOOTSTRAP=/usr/local/goboot"},
225225
},
226-
"host-openbsd-amd64-60": &HostConfig{
227-
VMImage: "openbsd-amd64-60",
228-
machineType: "n1-highcpu-4",
229-
// OpenBSD 6.0 requires binaries built with Go 1.10, per https://golang.org/wiki/OpenBSD
230-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64.go1.10",
231-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-60.tar.gz",
232-
Notes: "OpenBSD 6.0; GCE VM is built from script in build/env/openbsd-amd64",
233-
SSHUsername: "gopher",
234-
},
235-
"host-openbsd-386-60": &HostConfig{
236-
VMImage: "openbsd-386-60",
237-
machineType: "n1-highcpu-4",
238-
// OpenBSD 6.0 requires binaries built with Go 1.10, per https://golang.org/wiki/OpenBSD
239-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386.go1.10",
240-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-60.tar.gz",
241-
Notes: "OpenBSD 6.0; GCE VM is built from script in build/env/openbsd-386",
242-
SSHUsername: "gopher",
243-
},
244226
"host-openbsd-amd64-62": &HostConfig{
245227
VMImage: "openbsd-amd64-62",
246228
machineType: "n1-highcpu-4",
@@ -280,30 +262,6 @@ var Hosts = map[string]*HostConfig{
280262
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"},
281263
OwnerGithub: "4a6f656c",
282264
},
283-
"host-freebsd-93-gce": &HostConfig{
284-
VMImage: "freebsd-amd64-gce93",
285-
machineType: "n1-highcpu-4",
286-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
287-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
288-
SSHUsername: "gopher",
289-
},
290-
"host-freebsd-10_3": &HostConfig{
291-
VMImage: "freebsd-amd64-103-b",
292-
Notes: "FreeBSD 10.3; GCE VM is built from script in build/env/freebsd-amd64",
293-
machineType: "n1-highcpu-4",
294-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
295-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
296-
env: []string{"CC=clang"},
297-
SSHUsername: "gopher",
298-
},
299-
"host-freebsd-10_4": &HostConfig{
300-
VMImage: "freebsd-amd64-104",
301-
Notes: "FreeBSD 10.4; GCE VM is built from script in build/env/freebsd-amd64",
302-
machineType: "n1-highcpu-4",
303-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
304-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
305-
SSHUsername: "gopher",
306-
},
307265
"host-freebsd-11_1": &HostConfig{
308266
VMImage: "freebsd-amd64-111-b",
309267
Notes: "FreeBSD 11.1; GCE VM is built from script in build/env/freebsd-amd64",
@@ -1442,29 +1400,6 @@ func explicitTrySet(projs ...string) func(proj, branch, goBranch string) bool {
14421400
}
14431401

14441402
func init() {
1445-
addBuilder(BuildConfig{
1446-
Name: "freebsd-amd64-gce93",
1447-
HostType: "host-freebsd-93-gce",
1448-
buildsRepo: disabledBuilder,
1449-
})
1450-
addBuilder(BuildConfig{
1451-
Name: "freebsd-amd64-10_3",
1452-
HostType: "host-freebsd-10_3",
1453-
buildsRepo: func(repo, branch, goBranch string) bool {
1454-
return goBranch == "release-branch.go1.12" && buildRepoByDefault(repo)
1455-
},
1456-
tryBot: func(repo, branch, goBranch string) bool {
1457-
return branch == "release-branch.go1.12"
1458-
},
1459-
})
1460-
addBuilder(BuildConfig{
1461-
Name: "freebsd-amd64-10_4",
1462-
HostType: "host-freebsd-10_4",
1463-
buildsRepo: func(repo, branch, goBranch string) bool {
1464-
return goBranch == "release-branch.go1.12" && buildRepoByDefault(repo)
1465-
},
1466-
tryBot: nil,
1467-
})
14681403
addBuilder(BuildConfig{
14691404
Name: "freebsd-amd64-11_1",
14701405
HostType: "host-freebsd-11_1",
@@ -1505,22 +1440,6 @@ func init() {
15051440
Name: "freebsd-amd64-race",
15061441
HostType: "host-freebsd-11_1-big", // TODO(golang.org/issue/40562): Update to newer FreeBSD.
15071442
})
1508-
addBuilder(BuildConfig{
1509-
Name: "freebsd-386-10_3",
1510-
HostType: "host-freebsd-10_3",
1511-
buildsRepo: func(repo, branch, goBranch string) bool {
1512-
return goBranch == "release-branch.go1.12" && buildRepoByDefault(repo)
1513-
},
1514-
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1515-
})
1516-
addBuilder(BuildConfig{
1517-
Name: "freebsd-386-10_4",
1518-
HostType: "host-freebsd-10_4",
1519-
buildsRepo: func(repo, branch, goBranch string) bool {
1520-
return goBranch == "release-branch.go1.12" && buildRepoByDefault(repo)
1521-
},
1522-
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
1523-
})
15241443
addBuilder(BuildConfig{
15251444
Name: "freebsd-386-11_1",
15261445
HostType: "host-freebsd-11_1",
@@ -1883,6 +1802,7 @@ func init() {
18831802
HostType: "host-nacl",
18841803
buildsRepo: func(repo, branch, goBranch string) bool {
18851804
// nacl support is removed in Go 1.14.
1805+
// TODO: Remove builder after Go 1.15 is out.
18861806
return repo == "go" && !atLeastGo1(goBranch, 14) && !strings.HasPrefix(goBranch, "dev.")
18871807
},
18881808
numTryTestHelpers: 3,
@@ -1893,6 +1813,7 @@ func init() {
18931813
HostType: "host-nacl",
18941814
buildsRepo: func(repo, branch, goBranch string) bool {
18951815
// nacl support is removed in Go 1.14.
1816+
// TODO: Remove builder after Go 1.15 is out.
18961817
return repo == "go" && !atLeastGo1(goBranch, 14) && !strings.HasPrefix(goBranch, "dev.")
18971818
},
18981819
tryBot: explicitTrySet("go"),
@@ -1933,27 +1854,6 @@ func init() {
19331854
"GO_DISABLE_OUTBOUND_NETWORK=1",
19341855
},
19351856
})
1936-
addBuilder(BuildConfig{
1937-
Name: "openbsd-amd64-60",
1938-
HostType: "host-openbsd-amd64-60",
1939-
distTestAdjust: noTestDirAndNoReboot,
1940-
buildsRepo: disabledBuilder,
1941-
numTestHelpers: 2,
1942-
numTryTestHelpers: 5,
1943-
})
1944-
addBuilder(BuildConfig{
1945-
Name: "openbsd-386-60",
1946-
HostType: "host-openbsd-386-60",
1947-
distTestAdjust: noTestDirAndNoReboot,
1948-
buildsRepo: disabledBuilder,
1949-
env: []string{
1950-
// cmd/go takes ~192 seconds on openbsd-386
1951-
// now, which is over the 180 second default
1952-
// dist test timeout. So, bump this builder
1953-
// up:
1954-
"GO_TEST_TIMEOUT_SCALE=2",
1955-
},
1956-
})
19571857
addBuilder(BuildConfig{
19581858
Name: "openbsd-386-62",
19591859
HostType: "host-openbsd-386-62",

dashboard/builders_test.go

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -356,21 +356,9 @@ func TestBuilderConfig(t *testing.T) {
356356
// go1.12.html: "Go 1.12 is the last release that is
357357
// supported on FreeBSD 10.x [... and 11.1]"
358358
// But golang.org/issue/40563 happened.
359-
{b("freebsd-386-10_3", "go"), none},
360-
{b("freebsd-386-10_3", "net"), none},
361-
{b("freebsd-386-10_3", "mobile"), none},
362-
{b("freebsd-amd64-10_3", "go"), none},
363-
{b("freebsd-amd64-10_3", "net"), none},
364-
{b("freebsd-amd64-10_3", "mobile"), none},
365359
{b("freebsd-amd64-11_1", "go"), none},
366360
{b("freebsd-amd64-11_1", "net"), none},
367361
{b("freebsd-amd64-11_1", "mobile"), none},
368-
{b("[email protected]", "go"), both},
369-
370-
{b("[email protected]", "mobile"), none},
371-
{b("[email protected]", "go"), isBuilder},
372-
{b("[email protected]", "net"), isBuilder},
373-
{b("[email protected]", "mobile"), none},
374362
{b("[email protected]", "go"), isBuilder},
375363
{b("[email protected]", "net"), isBuilder},
376364
{b("[email protected]", "mobile"), none},
@@ -425,6 +413,8 @@ func TestBuilderConfig(t *testing.T) {
425413
{b("android-amd64-emu", "go"), isBuilder},
426414
{b("android-386-emu", "go"), isBuilder},
427415

416+
// golang.org/doc/go1.13: "Go 1.13 is the last release
417+
// that will run on Native Client (NaCl)."
428418
{b("nacl-386", "go"), none},
429419
{b("[email protected]", "go"), none},
430420
{b("[email protected]", "go"), onlyPost},
@@ -487,13 +477,9 @@ func TestBuilderConfig(t *testing.T) {
487477
{b("darwin-amd64-10_15", "exp"), onlyPost},
488478
// ... but not on most others:
489479
{b("darwin-amd64-10_12", "exp"), none},
490-
{b("[email protected]", "exp"), none},
491-
{b("[email protected]", "exp"), none},
492480
{b("[email protected]", "exp"), none},
493481
{b("freebsd-386-11_2", "exp"), none},
494482
{b("freebsd-386-12_0", "exp"), none},
495-
{b("[email protected]", "exp"), none},
496-
{b("[email protected]", "exp"), none},
497483
{b("[email protected]", "exp"), none},
498484
{b("freebsd-amd64-11_2", "exp"), none},
499485
{b("freebsd-amd64-12_0", "exp"), none},
@@ -519,8 +505,6 @@ func TestBuilderConfig(t *testing.T) {
519505
{b("linux-amd64-sid", "build"), none},
520506
{b("linux-amd64-nocgo", "build"), none},
521507
{b("linux-386-longtest", "build"), none},
522-
{b("freebsd-386-10_3", "build"), none},
523-
{b("freebsd-386-10_4", "build"), none},
524508
{b("freebsd-386-11_1", "build"), none},
525509
{b("js-wasm", "build"), none},
526510
{b("android-386-emu", "build"), none},
@@ -606,16 +590,27 @@ func TestBuilderConfig(t *testing.T) {
606590
}
607591

608592
func TestHostConfigsAllUsed(t *testing.T) {
609-
used := map[string]bool{}
593+
knownUnused := map[string]bool{
594+
// Currently host-linux-armhf-cross and host-linux-armel-cross aren't
595+
// referenced, but the coordinator hard-codes them, so don't make
596+
// these two an error for now.
597+
"host-linux-armhf-cross": true,
598+
"host-linux-armel-cross": true,
599+
600+
"host-linux-x86-alpine": true, // TODO(golang.org/issue/19938): Fix the Alpine builder, or remove it.
601+
"host-linux-arm64-aws": true, // TODO(golang.org/issue/36841): Add a builder that uses this host, or remove it.
602+
}
603+
604+
used := make(map[string]bool)
610605
for _, conf := range Builders {
611606
used[conf.HostType] = true
612607
}
613608
for hostType := range Hosts {
614-
if !used[hostType] {
615-
// Currently host-linux-armhf-cross and host-linux-armel-cross aren't
616-
// referenced, but the coordinator hard-codes them, so don't make
617-
// this an error for now.
618-
t.Logf("warning: host type %q is not referenced from any build config", hostType)
609+
if !used[hostType] && !knownUnused[hostType] {
610+
t.Errorf("host type %q is not referenced from any build config", hostType)
611+
}
612+
if used[hostType] && knownUnused[hostType] {
613+
t.Errorf("host type %q should not be listed in knownUnused since it's in use", hostType)
619614
}
620615
}
621616
}

0 commit comments

Comments
 (0)