dashboard: remove the Windows ARM builder

The host-windows-arm-iotcore builder has been missing for an extended period of time. Attempts to contact the maintainer have failed. This removes the builder until we can find a replacement for windows-arm instances. Fixes golang/go#38493 For golang/go#38607 Change-Id: Ia7d2168f676a86bced754688b4e2d52e61f3125b Reviewed-on: https://go-review.googlesource.com/c/build/+/229559 Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
golang · Apr 23, 2020 · 3e01d87 · 3e01d87
1 parent 5910a27
commit 3e01d87
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/cmd/buildlet/Makefile b/cmd/buildlet/Makefile
@@ -35,7 +35,7 @@ compile:
 	GOOS=windows GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
 
 # buildlet.all is compiles & uploads all targets.
-buildlet.all: FORCE buildlet.aix-ppc64 buildlet.darwin-amd64 buildlet.freebsd-amd64 buildlet.linux-amd64 buildlet.netbsd-386 buildlet.netbsd-amd64 buildlet.netbsd-arm buildlet.openbsd-amd64.go1.10 buildlet.openbsd-386.go1.10 buildlet.openbsd-amd64 buildlet.openbsd-386 buildlet.plan9-386 buildlet.windows-amd64 buildlet.windows-arm buildlet.linux-arm buildlet.linux-arm-arm5 buildlet.linux-arm64 buildlet.linux-riscv64 buildlet.linux-mips buildlet.linux-mipsle buildlet.linux-mips64 buildlet.linux-mips64le buildlet.linux-ppc64 buildlet.linux-ppc64le buildlet.linux-s390x buildlet.solaris-amd64 buildlet.illumos-amd64
+buildlet.all: FORCE buildlet.aix-ppc64 buildlet.darwin-amd64 buildlet.freebsd-amd64 buildlet.linux-amd64 buildlet.netbsd-386 buildlet.netbsd-amd64 buildlet.netbsd-arm buildlet.openbsd-amd64.go1.10 buildlet.openbsd-386.go1.10 buildlet.openbsd-amd64 buildlet.openbsd-386 buildlet.plan9-386 buildlet.windows-amd64 buildlet.linux-arm buildlet.linux-arm-arm5 buildlet.linux-arm64 buildlet.linux-riscv64 buildlet.linux-mips buildlet.linux-mipsle buildlet.linux-mips64 buildlet.linux-mips64le buildlet.linux-ppc64 buildlet.linux-ppc64le buildlet.linux-s390x buildlet.solaris-amd64 buildlet.illumos-amd64
 	echo "done"
 
 buildlet.aix-ppc64: FORCE
@@ -112,10 +112,6 @@ buildlet.plan9-amd64: FORCE
 	go install golang.org/x/build/cmd/upload
 	upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@
 
-buildlet.windows-arm: FORCE buildlet_windows.go
-	go install golang.org/x/build/cmd/upload
-	upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@
-
 buildlet.windows-amd64: FORCE buildlet_windows.go
 	go install golang.org/x/build/cmd/upload
 	upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@

diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -472,12 +472,6 @@ var Hosts = map[string]*HostConfig{
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
 		SSHUsername:        "gopher",
 	},
-	"host-windows-arm-iotcore": &HostConfig{
-		IsReverse:   true,
-		ExpectNum:   1,
-		OwnerGithub: "jordanrh1",
-		env:         []string{"GOROOT_BOOTSTRAP=C:\\Data\\Go"},
-	},
 	"host-darwin-10_11": &HostConfig{
 		IsReverse: true,
 		ExpectNum: 3,
@@ -1575,8 +1569,8 @@ func init() {
 	addMiscCompile("-netbsd", "^netbsd-")                    // 4: amd64, 386, arm, arm64
 	addMiscCompile("-openbsd", "^openbsd-")                  // 4: amd64, 386, arm, arm64
 
-	// And 4 that don't fit above:
-	addMiscCompile("-other", "^(windows-arm|linux-s390x|linux-riscv64|dragonfly-amd64)$")
+	// And 3 that don't fit above:
+	addMiscCompile("-other", "^(linux-s390x|linux-riscv64|dragonfly-amd64)$")
 	// TODO: Issue 25963, get the misc-compile trybots for
 	// subrepos too, so "mobile" can at least be included as a
 	// misc-compile for ^android- and ^darwin-arm.
@@ -2072,15 +2066,6 @@ func init() {
 			// up:
 			"GO_TEST_TIMEOUT_SCALE=2"},
 	})
-	addBuilder(BuildConfig{
-		Name:         "windows-arm",
-		HostType:     "host-windows-arm-iotcore",
-		SkipSnapshot: true,
-		env: []string{
-			"GOARM=7",
-			"GO_TEST_TIMEOUT_SCALE=2",
-		},
-	})
 	addBuilder(BuildConfig{
 		Name:     "darwin-amd64-10_11",
 		HostType: "host-darwin-10_11",

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
@@ -712,6 +712,8 @@ func TestSlowBotAliases(t *testing.T) {
 	ports := strings.Fields(string(out))
 
 	done := map[string]bool{}
+	done["windows-arm"] = true // TODO(golang.org/issue/38607) disabled until builder is replaced
+
 	var add bytes.Buffer
 	check := func(term string, isArch bool) {
 		if done[term] {
@@ -780,8 +782,9 @@ func TestTryBotsCompileAllPorts(t *testing.T) {
 	ports := strings.Fields(string(out))
 
 	done := map[string]bool{}
-	done["nacl-386"] = true // removed in Go 1.14
-	done["nacl-arm"] = true // removed in Go 1.14
+	done["nacl-386"] = true    // removed in Go 1.14
+	done["nacl-arm"] = true    // removed in Go 1.14
+	done["windows-arm"] = true // TODO(golang.org/issue/38607) disabled until builder is replaced
 	check := func(goos, goarch string) {
 		if goos == "android" {
 			// TODO(golang.org/issue/25963): support
@@ -820,7 +823,6 @@ func TestTryBotsCompileAllPorts(t *testing.T) {
 		if _, ok := done[goosArch]; !ok {
 			t.Errorf("Missing trybot or misc-compile trybot: %q", goosArch)
 		}
-
 	}
 
 	for _, port := range ports {