Skip to content

Commit beddf46

Browse files
committed
dashboard: remove OpenBSD 6.4 builders
OpenBSD 6.4 is not supported by now. Fixes golang/go#49090. Fixes golang/go#36563. Fixes golang/go#38413. Fixes golang/go#46080. Change-Id: I9ddef89249a2d6eb24848cc54e3bbca7e1a58d57 Reviewed-on: https://go-review.googlesource.com/c/build/+/357370 Trust: Dmitri Shuralyov <[email protected]> Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]>
1 parent 0c6ea36 commit beddf46

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

dashboard/builders.go

-28
Original file line numberDiff line numberDiff line change
@@ -235,23 +235,6 @@ var Hosts = map[string]*HostConfig{
235235
OwnerGithub: "bradfitz", // at home
236236
env: []string{"GOROOT_BOOTSTRAP=/usr/local/goboot"},
237237
},
238-
"host-openbsd-amd64-64": &HostConfig{
239-
VMImage: "openbsd-amd64-64-190129a",
240-
MinCPUPlatform: "Intel Cascade Lake", // for better TSC? Maybe? see Issue 29223. builds faster at least.
241-
machineType: "n2-highcpu-4", // e2 instances do not support MinCPUPlatform or NestedVirt.
242-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
243-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
244-
Notes: "OpenBSD 6.4 with hw.smt=1; GCE VM is built from script in build/env/openbsd-amd64",
245-
SSHUsername: "gopher",
246-
},
247-
"host-openbsd-386-64": &HostConfig{
248-
VMImage: "openbsd-386-64",
249-
machineType: "e2-highcpu-4",
250-
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
251-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
252-
Notes: "OpenBSD 6.4; GCE VM is built from script in build/env/openbsd-386",
253-
SSHUsername: "gopher",
254-
},
255238
"host-openbsd-amd64-68": &HostConfig{
256239
VMImage: "openbsd-amd64-68-v3", // v3 adds 009_exit syspatch; see golang.org/cl/278732.
257240
machineType: "e2-highcpu-4",
@@ -1901,17 +1884,6 @@ func init() {
19011884
"GO_DISABLE_OUTBOUND_NETWORK=1",
19021885
},
19031886
})
1904-
addBuilder(BuildConfig{
1905-
Name: "openbsd-amd64-64",
1906-
HostType: "host-openbsd-amd64-64",
1907-
MinimumGoVersion: types.MajorMinor{1, 11},
1908-
distTestAdjust: noTestDirAndNoReboot,
1909-
})
1910-
addBuilder(BuildConfig{
1911-
Name: "openbsd-386-64",
1912-
HostType: "host-openbsd-386-64",
1913-
distTestAdjust: noTestDirAndNoReboot,
1914-
})
19151887
addBuilder(BuildConfig{
19161888
Name: "openbsd-amd64-68",
19171889
HostType: "host-openbsd-amd64-68",

dashboard/builders_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,6 @@ func TestBuilderConfig(t *testing.T) {
422422
{b("[email protected]", "go"), both},
423423
{b("[email protected]", "go"), both},
424424
{b("[email protected]", "go"), both},
425-
{b("[email protected]", "go"), onlyPost},
426-
{b("[email protected]", "go"), onlyPost},
427-
{b("[email protected]", "go"), onlyPost},
428425

429426
// FreeBSD 12.2
430427
{b("freebsd-amd64-12_2", "go"), both},
@@ -541,7 +538,6 @@ func TestBuilderConfig(t *testing.T) {
541538
{b("freebsd-386-12_2", "exp"), none},
542539
{b("freebsd-amd64-11_4", "exp"), none},
543540
{b("freebsd-amd64-12_2", "exp"), none},
544-
{b("openbsd-amd64-64", "exp"), none},
545541
{b("openbsd-amd64-68", "exp"), none},
546542
{b("js-wasm", "exp"), none},
547543

0 commit comments

Comments
 (0)