dashboard: remove explicit support for release-branch.go1.11
We do not support Go 1.11 by now, so there is no longer a need to
include filtering for release-branch.go1.11. Remove it to simplify
code and remove useless test cases.
There was a bug where the buildsRepo policy for freebsd-386-10_3,
freebsd-386-10_4, and freebsd-386-11_1 builders forgot to include
the default build policy, so it was testing x/mobile unintentionally.
Add a test case for its current behavior. It'll be fixed in next CL.
Updates golang/go#36506
Change-Id: I4b2ff6cae417bf4699ec99f5c427b8531e12e915
Reviewed-on: https://go-review.googlesource.com/c/build/+/214293
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 13320e7..447c471 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1388,19 +1388,17 @@
Name: "freebsd-amd64-10_3",
HostType: "host-freebsd-10_3",
buildsRepo: func(repo, branch, goBranch string) bool {
- return (branch == "release-branch.go1.11" || goBranch == "release-branch.go1.12") &&
- defaultBuildsRepoPolicy(repo, branch, goBranch)
+ return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
},
tryBot: func(repo, branch, goBranch string) bool {
- return branch == "release-branch.go1.11" || branch == "release-branch.go1.12"
+ return branch == "release-branch.go1.12"
},
})
addBuilder(BuildConfig{
Name: "freebsd-amd64-10_4",
HostType: "host-freebsd-10_4",
buildsRepo: func(repo, branch, goBranch string) bool {
- return (goBranch == "release-branch.go1.11" || goBranch == "release-branch.go1.12") &&
- defaultBuildsRepoPolicy(repo, branch, goBranch)
+ return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
},
tryBot: nil,
})
@@ -1409,8 +1407,7 @@
HostType: "host-freebsd-11_1",
tryBot: nil,
buildsRepo: func(repo, branch, goBranch string) bool {
- return (goBranch == "release-branch.go1.11" || goBranch == "release-branch.go1.12") &&
- defaultBuildsRepoPolicy(repo, branch, goBranch)
+ return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
},
shouldRunDistTest: fasterTrybots,
numTryTestHelpers: 4,
@@ -1436,12 +1433,6 @@
HostType: "host-freebsd-12_0",
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
shouldRunDistTest: fasterTrybots,
- buildsRepo: func(repo, branch, goBranch string) bool {
- if repo == "net" && branch == "master" && goBranch == "release-branch.go1.11" {
- return false
- }
- return defaultBuildsRepoPolicy(repo, branch, goBranch)
- },
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
@@ -1452,7 +1443,7 @@
Name: "freebsd-386-10_3",
HostType: "host-freebsd-10_3",
buildsRepo: func(repo, branch, goBranch string) bool {
- return goBranch == "release-branch.go1.11" || goBranch == "release-branch.go1.12"
+ return goBranch == "release-branch.go1.12"
},
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
})
@@ -1460,7 +1451,7 @@
Name: "freebsd-386-10_4",
HostType: "host-freebsd-10_4",
buildsRepo: func(repo, branch, goBranch string) bool {
- return goBranch == "release-branch.go1.11" || goBranch == "release-branch.go1.12"
+ return goBranch == "release-branch.go1.12"
},
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
})
@@ -1469,7 +1460,7 @@
HostType: "host-freebsd-11_1",
shouldRunDistTest: noTestDir,
buildsRepo: func(repo, branch, goBranch string) bool {
- return goBranch == "release-branch.go1.11" || goBranch == "release-branch.go1.12"
+ return goBranch == "release-branch.go1.12"
},
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
})
@@ -1477,14 +1468,8 @@
Name: "freebsd-386-11_2",
HostType: "host-freebsd-11_2",
shouldRunDistTest: noTestDir,
- buildsRepo: func(repo, branch, goBranch string) bool {
- if repo == "net" && branch == "master" && goBranch == "release-branch.go1.11" {
- return false
- }
- return defaultBuildsRepoPolicy(repo, branch, goBranch)
- },
- tryBot: explicitTrySet("sys"),
- env: []string{"GOARCH=386", "GOHOSTARCH=386"},
+ tryBot: explicitTrySet("sys"),
+ env: []string{"GOARCH=386", "GOHOSTARCH=386"},
})
addBuilder(BuildConfig{
Name: "linux-386",
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 69f4bc9..8ea91ec 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -301,25 +301,22 @@
// Don't test all subrepos on all the builders.
{b("linux-amd64-ssacheck", "net"), none},
{b("linux-amd64-ssacheck@go1.10", "net"), none},
- {b("linux-amd64-noopt@go1.11", "net"), none},
- {b("linux-386-387@go1.11", "net"), none},
- {b("linux-386-387@go1.11", "go"), onlyPost},
{b("linux-386-387", "crypto"), onlyPost},
- {b("linux-arm-arm5spacemonkey@go1.11", "net"), none},
{b("linux-arm-arm5spacemonkey@go1.12", "net"), none},
{b("linux-arm-arm5spacemonkey", "exp"), none},
{b("linux-arm-arm5spacemonkey", "mobile"), none},
// The mobile repo requires Go 1.13+.
- {b("android-amd64-emu", "go"), both},
{b("android-amd64-emu", "mobile"), both},
{b("android-amd64-emu", "mobile@1.10"), none},
{b("android-amd64-emu", "mobile@1.11"), none},
{b("android-amd64-emu@go1.10", "mobile"), none},
- {b("android-amd64-emu@go1.11", "mobile"), none},
{b("android-amd64-emu@go1.12", "mobile"), none},
{b("android-amd64-emu@go1.13", "mobile"), both},
{b("android-amd64-emu", "mobile@1.13"), both},
+ {b("freebsd-386-11_1@go1.12", "mobile"), onlyPost}, // TODO(dmitshur, golang.org/issue/36506): accurately refrects current state, but should be changed to none
+
+ {b("android-amd64-emu", "go"), both},
{b("android-amd64-emu", "crypto"), both},
{b("android-amd64-emu", "net"), both},
{b("android-amd64-emu", "sync"), both},
@@ -334,7 +331,6 @@
{b("android-386-emu", "mobile@1.10"), none},
{b("android-386-emu", "mobile@1.11"), none},
{b("android-386-emu@go1.10", "mobile"), none},
- {b("android-386-emu@go1.11", "mobile"), none},
{b("android-386-emu@go1.12", "mobile"), none},
{b("android-386-emu@go1.13", "mobile"), onlyPost},
{b("android-386-emu", "mobile@1.13"), onlyPost},
@@ -346,8 +342,6 @@
{b("linux-amd64", "net@1.11"), both},
{b("linux-amd64", "net@1.10"), none}, // too old
{b("linux-amd64@go1.10", "net"), none}, // too old
- {b("linux-amd64@go1.11", "net"), both},
- {b("linux-amd64@go1.11", "net@1.11"), both},
{b("linux-amd64@go1.12", "net@1.12"), both},
{b("linux-mips64le-mengzhuo", "go"), onlyPost},
@@ -368,12 +362,6 @@
{b("freebsd-amd64-10_3@go1.12", "go"), both},
{b("freebsd-amd64-10_3@go1.12", "net@1.12"), both},
{b("freebsd-amd64-10_3@go1.12", "mobile"), none},
- {b("freebsd-amd64-10_3@go1.11", "go"), both},
- {b("freebsd-amd64-10_3@go1.11", "net@1.11"), both},
- {b("freebsd-amd64-10_3@go1.11", "mobile"), none},
- {b("freebsd-amd64-10_4@go1.11", "go"), isBuilder},
- {b("freebsd-amd64-10_4@go1.11", "net"), isBuilder},
- {b("freebsd-amd64-10_4@go1.11", "mobile"), none},
{b("freebsd-amd64-10_4@go1.12", "go"), isBuilder},
{b("freebsd-amd64-10_4@go1.12", "net"), isBuilder},
{b("freebsd-amd64-10_4@go1.12", "mobile"), none},
@@ -383,9 +371,6 @@
{b("freebsd-amd64-11_1@go1.12", "go"), isBuilder},
{b("freebsd-amd64-11_1@go1.12", "net@1.12"), isBuilder},
{b("freebsd-amd64-11_1@go1.12", "mobile"), none},
- {b("freebsd-amd64-11_1@go1.11", "go"), isBuilder},
- {b("freebsd-amd64-11_1@go1.11", "net@1.11"), isBuilder},
- {b("freebsd-amd64-11_1@go1.11", "mobile"), none},
// FreeBSD 12.0
{b("freebsd-amd64-12_0", "go"), both},
@@ -412,9 +397,6 @@
{b("aix-ppc64@go1.12", "mobile"), none},
{b("aix-ppc64@go1.13", "net"), onlyPost},
{b("aix-ppc64@go1.13", "mobile"), none},
- {b("aix-ppc64@go1.11", "go"), none},
- {b("aix-ppc64@go1.11", "net"), none},
- {b("aix-ppc64@go1.11", "mobile"), none},
{b("linux-amd64-nocgo", "mobile"), none},
@@ -508,7 +490,6 @@
{b("js-wasm", "exp"), none},
// exp is experimental; it doesn't test against release branches.
- {b("linux-amd64@go1.11", "exp"), none},
{b("linux-amd64@go1.12", "exp"), none},
// the build repo is only really useful for linux-amd64 (where we run it),
@@ -535,11 +516,8 @@
// Only use latest macOS for subrepos, and only amd64:
{b("darwin-amd64-10_12", "net"), onlyPost},
- {b("darwin-amd64-10_12@go1.11", "net"), onlyPost},
{b("darwin-amd64-10_11", "net"), none},
- {b("darwin-amd64-10_11@go1.11", "net"), none},
{b("darwin-amd64-10_11@go1.12", "net"), none},
- {b("darwin-386-10_14@go1.11", "net"), none},
{b("darwin-amd64-10_15", "go"), onlyPost},
{b("darwin-amd64-10_14", "go"), onlyPost},
@@ -547,7 +525,6 @@
{b("darwin-amd64-10_11", "go"), onlyPost},
{b("darwin-amd64-10_10", "go"), none},
{b("darwin-amd64-10_10@go1.12", "go"), onlyPost},
- {b("darwin-amd64-10_10@go1.11", "go"), onlyPost},
{b("darwin-386-10_14", "go"), onlyPost},
{b("darwin-386-10_14@go1.12", "go"), none},
{b("darwin-386-10_14@go1.13", "go"), onlyPost},
@@ -558,33 +535,21 @@
{b("plan9-386", "net"), none}, // temporarily disabled
{b("plan9-386", "exp"), none},
{b("plan9-386", "mobile"), none},
- {b("plan9-386@go1.11", "go"), none},
{b("plan9-386@go1.12", "go"), none},
- {b("plan9-386@go1.11", "net"), none},
{b("plan9-386@go1.12", "net"), none},
{b("plan9-amd64-9front", "go"), onlyPost},
{b("plan9-amd64-9front", "exp"), none},
{b("plan9-amd64-9front", "mobile"), none},
- {b("plan9-amd64-9front@go1.11", "go"), none},
{b("plan9-amd64-9front@go1.12", "go"), none},
{b("plan9-amd64-9front", "net"), onlyPost},
- {b("plan9-amd64-9front@go1.11", "net"), none},
{b("plan9-amd64-9front@go1.12", "net"), none},
{b("plan9-arm", "go"), onlyPost},
{b("plan9-arm", "exp"), none},
{b("plan9-arm", "mobile"), none},
- {b("plan9-arm@go1.11", "go"), none},
{b("plan9-arm@go1.12", "go"), none},
{b("plan9-arm", "net"), onlyPost},
- {b("plan9-arm@go1.11", "net"), none},
{b("plan9-arm@go1.12", "net"), none},
- // x/net master with Go 1.11 doesn't work on our builders
- // on 32-bit FreeBSD. Remove distracting red from the dashboard
- // that'll never be fixed.
- {b("freebsd-386-11_2@go1.11", "net"), none},
- {b("freebsd-386-12_0@go1.11", "net"), none},
-
{b("dragonfly-amd64", "go"), onlyPost},
{b("dragonfly-amd64", "net"), onlyPost},
{b("dragonfly-amd64@go1.13", "net"), none}, // Dragonfly ABI changes only supported by Go 1.14+
