Skip to content

Commit 97a4f81

Browse files
committed
dashboard: retire windows-amd64-gce builder, replace with windows-amd64-2008
The windows-amd64-2008 is the same OS as windows-amd64-gce but is an auto-generated image. TODO: 386 auto-generated Windows builders, and then maybe we'll move TryBots to Windows Server 2016. One step at a time. This should be a no-op. I verified performance is the same. Updates golang/go#17513 Change-Id: I34984db14b87d03771e15465978b1687df6895f7 Reviewed-on: https://go-review.googlesource.com/41611 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
1 parent da19ce0 commit 97a4f81

File tree

4 files changed

+18
-27
lines changed

4 files changed

+18
-27
lines changed

cmd/coordinator/coordinator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func stagingClusterBuilders() map[string]dashboard.BuildConfig {
360360
"linux-arm-arm5",
361361
"linux-amd64",
362362
"linux-386-387",
363-
"windows-amd64-gce",
363+
"windows-amd64-2008",
364364
"windows-386-gce",
365365
} {
366366
if c, ok := dashboard.Builders[name]; ok {
@@ -658,7 +658,7 @@ func findWorkLoop(work chan<- builderRev) {
658658
log.Printf("ARM machine(s) registered.")
659659
work <- builderRev{name: "linux-arm", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
660660
} else {
661-
work <- builderRev{name: "windows-amd64-gce", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
661+
work <- builderRev{name: "windows-amd64-2008", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
662662
work <- builderRev{name: "windows-386-gce", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
663663
}
664664

cmd/gomote/gomote.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ behalf. All subsequent commands (such as "gomote run" or "gomote ls")
7777
then proxy your request via the coordinator. To access a buildlet
7878
directly (for example, when working on the buildlet code), you can
7979
skip the "gomote create" step and use the special builder name
80-
"<build-config-name>@ip[:port>", such as "windows-amd64-gce@10.1.5.3".
80+
"<build-config-name>@ip[:port>", such as "windows-amd64-2008@10.1.5.3".
8181
8282
*/
8383
package main

cmd/release/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ var builds = []*Build{
199199
OS: "windows",
200200
Arch: "amd64",
201201
Race: true,
202-
Builder: "windows-amd64-gce",
202+
Builder: "windows-amd64-2008",
203203
},
204204
{
205205
OS: "darwin",

dashboard/builders.go

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ func (c *BuildConfig) BuildSubrepos() bool {
617617
"linux-386", "linux-amd64", "linux-amd64-nocgo",
618618
"openbsd-386-60", "openbsd-amd64-60",
619619
"plan9-386",
620-
"windows-386-gce", "windows-amd64-gce":
620+
"windows-386-gce", "windows-amd64-2008":
621621
return true
622622
case "darwin-amd64-10_12":
623623
// Don't build subrepos on Sierra until
@@ -959,35 +959,26 @@ func init() {
959959
numTestHelpers: 1,
960960
})
961961
addBuilder(BuildConfig{
962-
Name: "windows-amd64-2008",
963-
HostType: "host-windows-amd64-2008",
964-
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
965-
MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
966-
})
967-
addBuilder(BuildConfig{
968-
Name: "windows-amd64-2012",
969-
HostType: "host-windows-amd64-2012",
970-
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
971-
MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
962+
Name: "windows-amd64-2008",
963+
HostType: "host-windows-amd64-2008",
964+
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
965+
TryBot: true,
966+
RunBench: true,
967+
numTryTestHelpers: 5,
972968
})
973969
addBuilder(BuildConfig{
974-
Name: "windows-amd64-2016",
975-
HostType: "host-windows-amd64-2016",
976-
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
977-
MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
970+
Name: "windows-amd64-2012",
971+
HostType: "host-windows-amd64-2012",
972+
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
978973
})
979974
addBuilder(BuildConfig{
980-
Name: "windows-amd64-gce",
981-
HostType: "host-windows-gce",
982-
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
983-
TryBot: true,
984-
numTestHelpers: 1,
985-
numTryTestHelpers: 5,
986-
RunBench: true,
975+
Name: "windows-amd64-2016",
976+
HostType: "host-windows-amd64-2016",
977+
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
987978
})
988979
addBuilder(BuildConfig{
989980
Name: "windows-amd64-race",
990-
HostType: "host-windows-gce",
981+
HostType: "host-windows-amd64-2008",
991982
Notes: "Only runs -race tests (./race.bat)",
992983
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
993984
})

0 commit comments

Comments
 (0)