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 <dmitshur@golang.org> Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Alexander Rakoczy <alex@golang.org>
golang · Oct 20, 2021 · beddf46 · beddf46
1 parent 0c6ea36
commit beddf46
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -235,23 +235,6 @@ var Hosts = map[string]*HostConfig{
 		OwnerGithub: "bradfitz", // at home
 		env:         []string{"GOROOT_BOOTSTRAP=/usr/local/goboot"},
 	},
-	"host-openbsd-amd64-64": &HostConfig{
-		VMImage:            "openbsd-amd64-64-190129a",
-		MinCPUPlatform:     "Intel Cascade Lake", // for better TSC? Maybe? see Issue 29223. builds faster at least.
-		machineType:        "n2-highcpu-4",       // e2 instances do not support MinCPUPlatform or NestedVirt.
-		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
-		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
-		Notes:              "OpenBSD 6.4 with hw.smt=1; GCE VM is built from script in build/env/openbsd-amd64",
-		SSHUsername:        "gopher",
-	},
-	"host-openbsd-386-64": &HostConfig{
-		VMImage:            "openbsd-386-64",
-		machineType:        "e2-highcpu-4",
-		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
-		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
-		Notes:              "OpenBSD 6.4; GCE VM is built from script in build/env/openbsd-386",
-		SSHUsername:        "gopher",
-	},
 	"host-openbsd-amd64-68": &HostConfig{
 		VMImage:            "openbsd-amd64-68-v3", // v3 adds 009_exit syspatch; see golang.org/cl/278732.
 		machineType:        "e2-highcpu-4",
@@ -1901,17 +1884,6 @@ func init() {
 			"GO_DISABLE_OUTBOUND_NETWORK=1",
 		},
 	})
-	addBuilder(BuildConfig{
-		Name:             "openbsd-amd64-64",
-		HostType:         "host-openbsd-amd64-64",
-		MinimumGoVersion: types.MajorMinor{1, 11},
-		distTestAdjust:   noTestDirAndNoReboot,
-	})
-	addBuilder(BuildConfig{
-		Name:           "openbsd-386-64",
-		HostType:       "host-openbsd-386-64",
-		distTestAdjust: noTestDirAndNoReboot,
-	})
 	addBuilder(BuildConfig{
 		Name:              "openbsd-amd64-68",
 		HostType:          "host-openbsd-amd64-68",

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
@@ -422,9 +422,6 @@ func TestBuilderConfig(t *testing.T) {
 		{b("openbsd-amd64-68@go1.16", "go"), both},
 		{b("openbsd-amd64-68@go1.15", "go"), both},
 		{b("openbsd-amd64-68@go1.14", "go"), both},
-		{b("openbsd-amd64-64@go1.16", "go"), onlyPost},
-		{b("openbsd-amd64-64@go1.15", "go"), onlyPost},
-		{b("openbsd-amd64-64@go1.14", "go"), onlyPost},
 
 		// FreeBSD 12.2
 		{b("freebsd-amd64-12_2", "go"), both},
@@ -541,7 +538,6 @@ func TestBuilderConfig(t *testing.T) {
 		{b("freebsd-386-12_2", "exp"), none},
 		{b("freebsd-amd64-11_4", "exp"), none},
 		{b("freebsd-amd64-12_2", "exp"), none},
-		{b("openbsd-amd64-64", "exp"), none},
 		{b("openbsd-amd64-68", "exp"), none},
 		{b("js-wasm", "exp"), none},