From fcf7a58c4e49972eecec21a62a4b6ccb9450f725 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Tue, 30 Apr 2019 22:37:31 +0000
Subject: [PATCH] dashboard: add darwin-amd64-nocgo config, remove nacl-386
 trybot

Also remove dead nacl-arm. It hasn't run in ages.

And update netbsd comment about why 386 doesn't run. And correct its
VM image name.

Updates golang/go#31705
Updates golang/go#31726

Change-Id: I9de4605f34a052d0a84684fca098388d75602a82
Reviewed-on: https://go-review.googlesource.com/c/build/+/174637
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 dashboard/builders.go      | 25 +++++++++----------------
 dashboard/builders_test.go | 10 +++++++---
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/dashboard/builders.go b/dashboard/builders.go
index ea29c915f0..fe0ccc3349 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -77,12 +77,6 @@ var Hosts = map[string]*HostConfig{
 		Notes:       "for localhost development of buildlets/gomote/coordinator only",
 		SSHUsername: os.Getenv("USER"),
 	},
-	"host-nacl-arm-davecheney": &HostConfig{
-		IsReverse:   true,
-		ExpectNum:   1,
-		Notes:       "Raspberry Pi 3",
-		OwnerGithub: "davecheney",
-	},
 	"host-nacl-kube": &HostConfig{
 		Notes:           "Container with Native Client binaries.",
 		ContainerImage:  "linux-x86-nacl:latest",
@@ -243,7 +237,7 @@ var Hosts = map[string]*HostConfig{
 	// Note: the netbsd-386 host hangs during the ../test phase of all.bash,
 	// so we don't use this for now. (See the netbsd-386-8 BuildConfig below.)
 	"host-netbsd-386-8_0": &HostConfig{
-		VMImage:            "netbsd-386-8-0-2018q1",
+		VMImage:            "netbsd-i386-8-0-2018q1",
 		Notes:              "NetBSD 8.0RC1; GCE VM is built from script in build/env/netbsd-386",
 		machineType:        "n1-highcpu-4",
 		buildletURLTmpl:    "http://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
@@ -1609,7 +1603,6 @@ func init() {
 		Name:              "nacl-386",
 		HostType:          "host-nacl-kube",
 		buildsRepo:        onlyGo,
-		tryBot:            explicitTrySet("go"),
 		MaxAtOnce:         2,
 		numTryTestHelpers: 3,
 		env:               []string{"GOOS=nacl", "GOARCH=386", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
@@ -1748,8 +1741,7 @@ func init() {
 		HostType:          "host-netbsd-386-8_0",
 		shouldRunDistTest: netBSDDistTestPolicy,
 		MaxAtOnce:         1,
-		// This builder currently hangs in the “../test” phase of all.bash.
-		// (https://golang.org/issue/25206)
+		// This builder currently hangs in the runtime tests; Issue 31726.
 		buildsRepo: disabledBuilder,
 	})
 	addBuilder(BuildConfig{
@@ -1904,6 +1896,13 @@ func init() {
 		shouldRunDistTest: macTestPolicy,
 		buildsRepo:        defaultPlusExp,
 	})
+	addBuilder(BuildConfig{
+		Name:              "darwin-amd64-nocgo",
+		HostType:          "host-darwin-10_14",
+		MaxAtOnce:         1,
+		shouldRunDistTest: noTestDir,
+		env:               []string{"CGO_ENABLED=0"},
+	})
 	addBuilder(BuildConfig{
 		Name:              "darwin-amd64-race",
 		HostType:          "host-darwin-10_12",
@@ -2121,12 +2120,6 @@ func init() {
 		shouldRunDistTest: noTestDir,
 		buildsRepo:        onlyMaster,
 	})
-	addBuilder(BuildConfig{
-		Name:         "nacl-arm",
-		HostType:     "host-nacl-arm-davecheney",
-		buildsRepo:   onlyGo,
-		SkipSnapshot: true,
-	})
 	addBuilder(BuildConfig{
 		Name:              "plan9-amd64-9front",
 		HostType:          "host-plan9-amd64-0intro",
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 803464cfa2..9cc58c566b 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -98,7 +98,6 @@ func TestTrybots(t *testing.T) {
 				"misc-compile-plan9",
 				"misc-compile-ppc",
 				"misc-vet-vetall",
-				"nacl-386",
 				"nacl-amd64p32",
 				"openbsd-amd64-64",
 				"windows-386-2008",
@@ -123,7 +122,6 @@ func TestTrybots(t *testing.T) {
 				"misc-compile-openbsd",
 				"misc-compile-plan9",
 				"misc-compile-ppc",
-				"nacl-386",
 				"nacl-amd64p32",
 				"openbsd-amd64-64",
 				"windows-386-2008",
@@ -342,6 +340,12 @@ func TestBuilderConfig(t *testing.T) {
 		{b("freebsd-386-12_0", "go"), onlyPost},
 		{b("freebsd-386-12_0", "net"), onlyPost},
 
+		// NetBSD
+		{b("netbsd-amd64-8_0", "go"), onlyPost},
+		{b("netbsd-amd64-8_0", "net"), onlyPost},
+		{b("netbsd-386-8_0", "go"), none},
+		{b("netbsd-386-8_0", "net"), none},
+
 		// AIX starts at Go 1.12
 		{b("aix-ppc64", "go"), onlyPost},
 		{b("aix-ppc64", "net"), onlyPost},
@@ -383,7 +387,7 @@ func TestBuilderConfig(t *testing.T) {
 		{b("android-amd64-emu", "go"), isBuilder},
 		{b("android-386-emu", "go"), isBuilder},
 
-		{b("nacl-386", "go"), both},
+		{b("nacl-386", "go"), onlyPost},
 		{b("nacl-386", "net"), none},
 		{b("nacl-amd64p32", "go"), both},
 		{b("nacl-amd64p32", "net"), none},