From d83028eda5e2c7a1f5f4f0b5d21703891edbd026 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Wed, 7 Sep 2016 05:41:02 +0000
Subject: [PATCH] cmd/coordinator, dashboard: switch to new VMWare-based OS X
 builders

Ignore the old darwin-{amd64,386}-10_10 builders. Don't give them an
error, but pretend they don't exist.

Also: switch trybots from OS X 10.10 to OS X 10.11, and re-enable
sharding. Let's hope for the best. See golang/go#12979.

This also enables subrepo tests for all OS X versions.

darwin-386-* is currently offline, pending some golang/go#17009

Updates golang/go#9495 (OS X virtualization)

Change-Id: I4d53a79087404b5e8051d1aff0c668a92625f442
Reviewed-on: https://go-review.googlesource.com/28583
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 cmd/coordinator/coordinator.go |  2 +-
 cmd/coordinator/reverse.go     | 17 +++++++++++++++-
 dashboard/builders.go          | 36 +++++++++++++++-------------------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
index 04d4cebf63..b331321c59 100644
--- a/cmd/coordinator/coordinator.go
+++ b/cmd/coordinator/coordinator.go
@@ -101,7 +101,7 @@ var (
 
 func initTryBuilders() {
 	tryList := []string{
-		"darwin-amd64-10_10",
+		"darwin-amd64-10_11",
 		"linux-386",
 		"linux-amd64",
 		"linux-amd64-race",
diff --git a/cmd/coordinator/reverse.go b/cmd/coordinator/reverse.go
index 2cc2080b4e..4ec79eb2a7 100644
--- a/cmd/coordinator/reverse.go
+++ b/cmd/coordinator/reverse.go
@@ -417,6 +417,8 @@ func handleReverse(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, fmt.Sprintf("need at least one mode and matching key, got %d/%d", len(modes), len(gobuildkeys)), http.StatusPreconditionFailed)
 		return
 	}
+	hostname := r.Header.Get("X-Go-Builder-Hostname")
+
 	for i, m := range modes {
 		if gobuildkeys[i] != builderKey(m) {
 			http.Error(w, fmt.Sprintf("bad key for mode %q", m), http.StatusPreconditionFailed)
@@ -424,12 +426,25 @@ func handleReverse(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// Silently pretend that "gomacmini-*.local" doesn't want to do darwin-amd64-10_10 and
+	// darwin-386-10_10 anymore.
+	// TODO(bradfitz): remove this hack after we reconfigure those machines.
+	if strings.HasPrefix(hostname, "gomacmini-") && strings.HasSuffix(hostname, ".local") {
+		var filtered []string
+		for _, m := range modes {
+			if m == "darwin-amd64-10_10" || m == "darwin-386-10_10" {
+				continue
+			}
+			filtered = append(filtered, m)
+		}
+		modes = filtered
+	}
+
 	conn, bufrw, err := w.(http.Hijacker).Hijack()
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	hostname := r.Header.Get("X-Go-Builder-Hostname")
 
 	revDialer := revdial.NewDialer(bufrw, conn)
 
diff --git a/dashboard/builders.go b/dashboard/builders.go
index a18e9533fe..8f298d9bce 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -168,7 +168,10 @@ func (c *BuildConfig) BuildSubrepos() bool {
 	}
 	// TODO(adg,bradfitz): expand this as required
 	switch c.Name {
-	case "darwin-amd64-10_10",
+	case "darwin-amd64-10_8",
+		"darwin-amd64-10_10",
+		"darwin-amd64-10_11",
+		"darwin-386-10_11",
 		"freebsd-386-gce101", "freebsd-amd64-gce101",
 		"linux-386", "linux-amd64", "linux-amd64-nocgo",
 		"openbsd-386-gce58", "openbsd-amd64-gce58",
@@ -512,38 +515,31 @@ func init() {
 		env:                []string{"GOARCH=386", "GOHOSTARCH=386"},
 		NumTestHelpers:     3,
 	})
-	addBuilder(BuildConfig{
-		Name:               "darwin-amd64-10_10",
-		Notes:              "Mac Mini running OS X 10.10 (Yosemite)",
-		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-darwin-amd64.tar.gz",
-		IsReverse:          true,
-		NumTestHelpers:     0, // disabled per golang.org/issue/12979
-	})
-	addBuilder(BuildConfig{
-		Name:               "darwin-386-10_10",
-		Notes:              "Mac Mini running OS X 10.10 (Yosemite)",
-		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-darwin-amd64.tar.gz",
-		IsReverse:          true,
-		env:                []string{"GOARCH=386", "GOHOSTARCH=386"},
-		NumTestHelpers:     0, // disabled per golang.org/issue/12979
-	})
-
 	addBuilder(BuildConfig{
 		Name:      "darwin-amd64-10_8",
+		Notes:     "MacStadium OS X 10.8 VM under VMWare ESXi",
 		IsReverse: true,
-		FlakyNet:  true,
 		env: []string{
 			"GOROOT_BOOTSTRAP=/Users/gopher/go1.4",
 		},
 	})
 	addBuilder(BuildConfig{
-		Name:      "darwin-amd64-10_11",
-		FlakyNet:  true,
+		Name:      "darwin-amd64-10_10",
+		Notes:     "MacStadium OS X 10.10 VM under VMWare ESXi",
 		IsReverse: true,
 		env: []string{
 			"GOROOT_BOOTSTRAP=/Users/gopher/go1.4",
 		},
 	})
+	addBuilder(BuildConfig{
+		Name:           "darwin-amd64-10_11",
+		Notes:          "MacStadium OS X 10.11 VM under VMWare ESXi",
+		NumTestHelpers: 2,
+		IsReverse:      true,
+		env: []string{
+			"GOROOT_BOOTSTRAP=/Users/gopher/go1.4",
+		},
+	})
 
 	addBuilder(BuildConfig{
 		Name:               "android-arm-sdk19",