cmd/buildlet, dashboard: support for v2 windows images, 386 builder

- images now include 32bit gcc in c:\godeps\gcc32
- 64bit gcc has moved to c:\godeps\gcc64
- update host definitions for new image versions
- add windows-386-2008 host

Updates golang/go#17513

Change-Id: Ib3f5d4b2b1702c05089cf633529ebf38db270a43
Reviewed-on: https://go-review.googlesource.com/42014
Reviewed-by: Brad Fitzpatrick <[email protected]>

Author: johnsonj

cmd/buildlet/buildlet.go

@@ -990,6 +990,8 @@ func hasPrefixFold(s, prefix string) bool {
 func windowsPath(old string, is64Bit bool) string {
 	vv := filepath.SplitList(old)
 	newPath := make([]string, 0, len(vv))
+
+	// for windows-buildlet-v2 images
 	for _, v := range vv {
 		// The base VM image has both the 32-bit and 64-bit gcc installed.
 		// They're both in the environment, so scrub the one
@@ -1002,7 +1004,14 @@ func windowsPath(old string, is64Bit bool) string {
 		}
 		newPath = append(newPath, v)
 	}
-	newPath = append(newPath, `C:\godep\gcc\bin`)
+
+	// for windows-amd64-* images
+	if is64Bit {
+		newPath = append(newPath, `C:\godep\gcc64\bin`)
+	} else {
+		newPath = append(newPath, `C:\godep\gcc32\bin`)
+	}
+
 	return strings.Join(newPath, string(filepath.ListSeparator))
 }
 

dashboard/builders.go

@@ -168,19 +168,19 @@ var Hosts = map[string]*HostConfig{
 		RegularDisk:        true,
 	},
 	"host-windows-amd64-2008": &HostConfig{
-		VMImage:            "windows-amd64-server-2008r2-v1",
+		VMImage:            "windows-amd64-server-2008r2-v2",
 		machineType:        "n1-highcpu-4",
 		buildletURLTmpl:    "http://storage.googleapis.com/$BUCKET/buildlet.windows-amd64",
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
 	},
 	"host-windows-amd64-2012": &HostConfig{
-		VMImage:            "windows-amd64-server-2012r2-v1",
+		VMImage:            "windows-amd64-server-2012r2-v2",
 		machineType:        "n1-highcpu-4",
 		buildletURLTmpl:    "http://storage.googleapis.com/$BUCKET/buildlet.windows-amd64",
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
 	},
 	"host-windows-amd64-2016": &HostConfig{
-		VMImage:            "windows-amd64-server-2016-v1",
+		VMImage:            "windows-amd64-server-2016-v2",
 		machineType:        "n1-highcpu-4",
 		buildletURLTmpl:    "http://storage.googleapis.com/$BUCKET/buildlet.windows-amd64",
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
@@ -618,7 +618,7 @@ func (c *BuildConfig) BuildSubrepos() bool {
 		"linux-386", "linux-amd64", "linux-amd64-nocgo",
 		"openbsd-386-60", "openbsd-amd64-60",
 		"plan9-386",
-		"windows-386-gce", "windows-amd64-2008":
+		"windows-386-gce", "windows-amd64-2008", "windows-386-2008":
 		return true
 	case "darwin-amd64-10_12":
 		// Don't build subrepos on Sierra until
@@ -959,6 +959,14 @@ func init() {
 		RunBench:          true,
 		numTryTestHelpers: 5,
 	})
+	addBuilder(BuildConfig{
+		Name:              "windows-386-2008",
+		HostType:          "host-windows-amd64-2008",
+		env:               []string{"GOARCH=386", "GOHOSTARCH=386"},
+		TryBot:            false, // Disabled until new Windows builders reliably come up quickly
+		RunBench:          true,
+		numTryTestHelpers: 5,
+	})
 	addBuilder(BuildConfig{
 		Name:     "windows-amd64-2012",
 		HostType: "host-windows-amd64-2012",