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>
diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
index 6d76341..27b6e3f 100644
--- a/cmd/coordinator/coordinator.go
+++ b/cmd/coordinator/coordinator.go
@@ -360,7 +360,7 @@
"linux-arm-arm5",
"linux-amd64",
"linux-386-387",
- "windows-amd64-gce",
+ "windows-amd64-2008",
"windows-386-gce",
} {
if c, ok := dashboard.Builders[name]; ok {
@@ -658,7 +658,7 @@
log.Printf("ARM machine(s) registered.")
work <- builderRev{name: "linux-arm", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
} else {
- work <- builderRev{name: "windows-amd64-gce", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
+ work <- builderRev{name: "windows-amd64-2008", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
work <- builderRev{name: "windows-386-gce", rev: "3129c67db76bc8ee13a1edc38a6c25f9eddcbc6c"}
}
diff --git a/cmd/gomote/gomote.go b/cmd/gomote/gomote.go
index c7996a6..4490e92 100644
--- a/cmd/gomote/gomote.go
+++ b/cmd/gomote/gomote.go
@@ -77,7 +77,7 @@
then proxy your request via the coordinator. To access a buildlet
directly (for example, when working on the buildlet code), you can
skip the "gomote create" step and use the special builder name
-"<build-config-name>@ip[:port>", such as "windows-amd64-gce@10.1.5.3".
+"<build-config-name>@ip[:port>", such as "windows-amd64-2008@10.1.5.3".
*/
package main
diff --git a/cmd/release/release.go b/cmd/release/release.go
index 45498e3..d474e30 100644
--- a/cmd/release/release.go
+++ b/cmd/release/release.go
@@ -199,7 +199,7 @@
OS: "windows",
Arch: "amd64",
Race: true,
- Builder: "windows-amd64-gce",
+ Builder: "windows-amd64-2008",
},
{
OS: "darwin",
diff --git a/dashboard/builders.go b/dashboard/builders.go
index fe6817c..e818b36 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -617,7 +617,7 @@
"linux-386", "linux-amd64", "linux-amd64-nocgo",
"openbsd-386-60", "openbsd-amd64-60",
"plan9-386",
- "windows-386-gce", "windows-amd64-gce":
+ "windows-386-gce", "windows-amd64-2008":
return true
case "darwin-amd64-10_12":
// Don't build subrepos on Sierra until
@@ -959,35 +959,26 @@
numTestHelpers: 1,
})
addBuilder(BuildConfig{
- Name: "windows-amd64-2008",
- HostType: "host-windows-amd64-2008",
- env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
- MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
- })
- addBuilder(BuildConfig{
- Name: "windows-amd64-2012",
- HostType: "host-windows-amd64-2012",
- env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
- MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
- })
- addBuilder(BuildConfig{
- Name: "windows-amd64-2016",
- HostType: "host-windows-amd64-2016",
- env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
- MaxAtOnce: 1, // TODO(bradfitz): for now, until proven
- })
- addBuilder(BuildConfig{
- Name: "windows-amd64-gce",
- HostType: "host-windows-gce",
+ Name: "windows-amd64-2008",
+ HostType: "host-windows-amd64-2008",
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
TryBot: true,
- numTestHelpers: 1,
- numTryTestHelpers: 5,
RunBench: true,
+ numTryTestHelpers: 5,
+ })
+ addBuilder(BuildConfig{
+ Name: "windows-amd64-2012",
+ HostType: "host-windows-amd64-2012",
+ env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
+ })
+ addBuilder(BuildConfig{
+ Name: "windows-amd64-2016",
+ HostType: "host-windows-amd64-2016",
+ env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
})
addBuilder(BuildConfig{
Name: "windows-amd64-race",
- HostType: "host-windows-gce",
+ HostType: "host-windows-amd64-2008",
Notes: "Only runs -race tests (./race.bat)",
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
})
