dashboard: add FreeBSD 11.2 and 10.4 builders

Not yet the defaults or trybots until we see they're working regularly
for a few days and compare timings, etc.

Updates golang/go#25289

Change-Id: I4baed066b5f6d9f01e5454b716cacda4986620d0
Reviewed-on: https://go-review.googlesource.com/138258
Reviewed-by: Yuval Pavel Zholkover <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>

Author: bradfitz

dashboard/builders.go

@@ -162,6 +162,14 @@ var Hosts = map[string]*HostConfig{
 		env:                []string{"CC=clang"},
 		SSHUsername:        "gopher",
 	},
+	"host-freebsd-10_4": &HostConfig{
+		VMImage:            "freebsd-amd64-104",
+		Notes:              "FreeBSD 10.4; GCE VM is built from script in build/env/freebsd-amd64",
+		machineType:        "n1-highcpu-4",
+		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
+		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
+		SSHUsername:        "gopher",
+	},
 	"host-freebsd-11_1": &HostConfig{
 		VMImage:            "freebsd-amd64-111-b",
 		Notes:              "FreeBSD 11.1; GCE VM is built from script in build/env/freebsd-amd64",
@@ -171,6 +179,14 @@ var Hosts = map[string]*HostConfig{
 		env:                []string{"CC=clang"},
 		SSHUsername:        "gopher",
 	},
+	"host-freebsd-11_2": &HostConfig{
+		VMImage:            "freebsd-amd64-112",
+		Notes:              "FreeBSD 11.2; GCE VM is built from script in build/env/freebsd-amd64",
+		machineType:        "n1-highcpu-4",
+		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
+		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
+		SSHUsername:        "gopher",
+	},
 	"host-netbsd-amd64-8_0": &HostConfig{
 		VMImage:            "netbsd-amd64-8-0-2018q1",
 		Notes:              "NetBSD 8.0RC1; GCE VM is built from script in build/env/netbsd-amd64",
@@ -760,14 +776,16 @@ func (c *BuildConfig) BuildSubrepos() bool {
 	if !c.SplitMakeRun() {
 		return false
 	}
-	// TODO(adg,bradfitz): expand this as required
+	// TODO(bradfitz,dmitshur): move this into BuildConfig bools, rather than this Name switch.
 	switch c.Name {
 	case "darwin-amd64-10_11",
 		"darwin-386-10_11",
 		// TODO: add darwin-amd64-10_12 when we have a build scheduler
 		"freebsd-amd64-93",
 		"freebsd-386-10_3", "freebsd-amd64-10_3",
 		"freebsd-386-11_1", "freebsd-amd64-11_1",
+		"freebsd-386-10_4", "freebsd-amd64-10_4",
+		"freebsd-386-11_2", "freebsd-amd64-11_2",
 		"linux-386", "linux-amd64", "linux-amd64-nocgo",
 		"linux-s390x-ibm",
 		"openbsd-386-60", "openbsd-amd64-60",
@@ -928,6 +946,11 @@ func init() {
 		HostType:  "host-freebsd-10_3",
 		MaxAtOnce: 2,
 	})
+	addBuilder(BuildConfig{
+		Name:      "freebsd-amd64-10_4",
+		HostType:  "host-freebsd-10_4",
+		MaxAtOnce: 2,
+	})
 	addBuilder(BuildConfig{
 		Name:              "freebsd-amd64-11_1",
 		HostType:          "host-freebsd-11_1",
@@ -936,6 +959,14 @@ func init() {
 		numTryTestHelpers: 4,
 		MaxAtOnce:         2,
 	})
+	addBuilder(BuildConfig{
+		Name:              "freebsd-amd64-11_2",
+		HostType:          "host-freebsd-11_2",
+		TryBot:            false, // not yet. once we see it's passing regularly.
+		ShouldRunDistTest: fasterTrybots,
+		numTryTestHelpers: 4,
+		MaxAtOnce:         2,
+	})
 	addBuilder(BuildConfig{
 		Name:      "freebsd-amd64-race",
 		HostType:  "host-freebsd-11_1",
@@ -947,13 +978,26 @@ func init() {
 		env:       []string{"GOARCH=386", "GOHOSTARCH=386"},
 		MaxAtOnce: 2,
 	})
+	addBuilder(BuildConfig{
+		Name:      "freebsd-386-10_4",
+		HostType:  "host-freebsd-10_4",
+		env:       []string{"GOARCH=386", "GOHOSTARCH=386"},
+		MaxAtOnce: 2,
+	})
 	addBuilder(BuildConfig{
 		Name:              "freebsd-386-11_1",
 		HostType:          "host-freebsd-11_1",
 		ShouldRunDistTest: noTestDir,
 		env:               []string{"GOARCH=386", "GOHOSTARCH=386"},
 		MaxAtOnce:         2,
 	})
+	addBuilder(BuildConfig{
+		Name:              "freebsd-386-11_2",
+		HostType:          "host-freebsd-11_2",
+		ShouldRunDistTest: noTestDir,
+		env:               []string{"GOARCH=386", "GOHOSTARCH=386"},
+		MaxAtOnce:         2,
+	})
 	addBuilder(BuildConfig{
 		Name:              "linux-386",
 		HostType:          "host-linux-jessie",

env/freebsd-amd64/.gitignore

@@ -0,0 +1,3 @@
+iso
+config.iso
+*.raw

env/freebsd-amd64/Makefile

@@ -1,14 +1,19 @@
+# TODO: move all this into the xb command and use it everywhere.
+# For now it's expected that this is hand-tweaked per version bump.
+
 upload-staging:
 	go install golang.org/x/build/cmd/upload
-	upload --verbose --file=freebsd-amd64-110.tar.gz --public dev-go-builder-data/freebsd-amd64-110.tar.gz
+	upload --verbose --file=freebsd-amd64-112.tar.gz --public dev-go-builder-data/freebsd-amd64-112.tar.gz
 
 upload-prod:
 	go install golang.org/x/build/cmd/upload
-	upload --verbose --file=freebsd-amd64-110.tar.gz --public go-builder-data/freebsd-amd64-110.tar.gz
+	upload --verbose --file=freebsd-amd64-112.tar.gz --public go-builder-data/freebsd-amd64-112.tar.gz
 
 create-image-staging:
-	gcloud compute --project go-dashboard-dev images create freebsd-amd64-110 --source-uri gs://dev-go-builder-data/freebsd-amd64-110.tar.gz
+	gcloud compute --project go-dashboard-dev images create freebsd-amd64-112 --source-uri gs://dev-go-builder-data/freebsd-amd64-112.tar.gz
 
 create-image-prod:
-	gcloud compute --project symbolic-datum-552 images create freebsd-amd64-110 --source-uri gs://go-builder-data/freebsd-amd64-110.tar.gz
+	gcloud compute --project symbolic-datum-552 images create freebsd-amd64-112 --source-uri gs://go-builder-data/freebsd-amd64-112.tar.gz
 
+delete-image-prod:
+	gcloud compute --project symbolic-datum-552 images delete freebsd-amd64-112