Skip to content

Commit acd9ecf

Browse files
committed
dashboard: add configs for new windows 2008, 2012, 2016 builders
See also: https://golang.org/cl/41142 Updates golang/go#17513 Change-Id: Ie743ae4604e65892e28423ed0af008450b647197 Reviewed-on: https://go-review.googlesource.com/41393 Reviewed-by: Jeff Johnson <[email protected]> Reviewed-by: Alex Brainman <[email protected]>
1 parent 0d86378 commit acd9ecf

File tree

4 files changed

+39
-1
lines changed

4 files changed

+39
-1
lines changed

buildlet/gce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ OpLoop:
256256
}
257257
condRun(opts.OnGotInstanceInfo)
258258

259-
const timeout = 3 * time.Minute
259+
const timeout = 5 * time.Minute
260260
var alive bool
261261
impatientClient := &http.Client{
262262
Timeout: 5 * time.Second,

cmd/buildlet/buildlet.go

+1
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,7 @@ func windowsPath(old string, is64Bit bool) string {
10021002
}
10031003
newPath = append(newPath, v)
10041004
}
1005+
newPath = append(newPath, `C:\godep\gcc\bin`)
10051006
return strings.Join(newPath, string(filepath.ListSeparator))
10061007
}
10071008

cmd/retrybuilds/retrybuilds.go

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ var flakePhrases = []string{
118118
"lookup gmail.com on 8.8.8.8:53",
119119
"lookup www.mit.edu on ",
120120
"undefined: runtime.SetMutexProfileFraction", // ppc64 builders had not-quite-go1.8 bootstrap
121+
"make.bat: The parameter is incorrect",
121122
}
122123

123124
func isFlaky(failLog string) bool {

dashboard/builders.go

+36
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,24 @@ var Hosts = map[string]*HostConfig{
166166
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
167167
RegularDisk: true,
168168
},
169+
"host-windows-amd64-2008": &HostConfig{
170+
VMImage: "windows-amd64-server-2008r2-v1",
171+
machineType: "n1-highcpu-4",
172+
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.windows-amd64",
173+
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
174+
},
175+
"host-windows-amd64-2012": &HostConfig{
176+
VMImage: "windows-amd64-server-2012r2-v1",
177+
machineType: "n1-highcpu-4",
178+
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.windows-amd64",
179+
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
180+
},
181+
"host-windows-amd64-2016": &HostConfig{
182+
VMImage: "windows-amd64-server-2016-v1",
183+
machineType: "n1-highcpu-4",
184+
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.windows-amd64",
185+
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
186+
},
169187
"host-darwin-10_8": &HostConfig{
170188
IsReverse: true,
171189
ExpectNum: 1,
@@ -917,6 +935,24 @@ func init() {
917935
HostType: "host-plan9-386-gce",
918936
numTestHelpers: 1,
919937
})
938+
addBuilder(BuildConfig{
939+
Name: "windows-amd64-2008",
940+
HostType: "host-windows-amd64-2008",
941+
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
942+
MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
943+
})
944+
addBuilder(BuildConfig{
945+
Name: "windows-amd64-2012",
946+
HostType: "host-windows-amd64-2012",
947+
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
948+
MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
949+
})
950+
addBuilder(BuildConfig{
951+
Name: "windows-amd64-2016",
952+
HostType: "host-windows-amd64-2016",
953+
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
954+
MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
955+
})
920956
addBuilder(BuildConfig{
921957
Name: "windows-amd64-gce",
922958
HostType: "host-windows-gce",

0 commit comments

Comments
 (0)