dashboard: re-enable FreeBSD 11.1 builders on Go 1.14 and 1.13
These builders are still used for making minor Go 1.14 and 1.13
releases at this time (see golang.org/issue/40563). Re-enable
them on relevant release branches so that we are better informed
for future minor releases.
For golang/go#40563.
Updates golang/go#40562.
Change-Id: I20a6becbdb1078b92dbf6042edca7f482bca6432
Reviewed-on: https://go-review.googlesource.com/c/build/+/246638
Reviewed-by: Carlos Amedee <carlos@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index c50f911..972f5ee 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1470,7 +1470,10 @@
HostType: "host-freebsd-11_1",
tryBot: nil,
buildsRepo: func(repo, branch, goBranch string) bool {
- return goBranch == "release-branch.go1.12" && buildRepoByDefault(repo)
+ // This builder is unfortunately still used by Go 1.14 and 1.13,
+ // so keep it around a bit longer. See golang.org/issue/40563.
+ // Test relevant Go versions so that we're better informed.
+ return atMostGo1(goBranch, 14) && buildRepoByDefault(repo)
},
distTestAdjust: fasterTrybots,
numTryTestHelpers: 4,
@@ -1500,7 +1503,7 @@
})
addBuilder(BuildConfig{
Name: "freebsd-amd64-race",
- HostType: "host-freebsd-11_1-big",
+ HostType: "host-freebsd-11_1-big", // TODO(golang.org/issue/40562): Update to newer FreeBSD.
})
addBuilder(BuildConfig{
Name: "freebsd-386-10_3",
@@ -1523,7 +1526,10 @@
HostType: "host-freebsd-11_1",
distTestAdjust: noTestDirAndNoReboot,
buildsRepo: func(repo, branch, goBranch string) bool {
- return goBranch == "release-branch.go1.12" && buildRepoByDefault(repo)
+ // This builder is unfortunately still used by Go 1.14 and 1.13,
+ // so keep it around a bit longer. See golang.org/issue/40563.
+ // Test relevant Go versions so that we're better informed.
+ return atMostGo1(goBranch, 14) && buildRepoByDefault(repo)
},
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
})
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 9cbd2b5..50ea610 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -319,7 +319,7 @@
{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"), none}, // This was golang.org/issue/36506.
+ {b("freebsd-386-11_1@go1.14", "mobile"), none}, // See golang.org/issue/36506.
{b("android-amd64-emu", "go"), both},
{b("android-amd64-emu", "crypto"), both},
@@ -355,6 +355,7 @@
// go1.12.html: "Go 1.12 is the last release that is
// supported on FreeBSD 10.x [... and 11.1]"
+ // But golang.org/issue/40563 happened.
{b("freebsd-386-10_3", "go"), none},
{b("freebsd-386-10_3", "net"), none},
{b("freebsd-386-10_3", "mobile"), none},
@@ -370,12 +371,12 @@
{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},
- {b("freebsd-amd64-11_1@go1.13", "go"), none},
- {b("freebsd-amd64-11_1@go1.13", "net@1.12"), none},
+ {b("freebsd-amd64-11_1@go1.14", "go"), isBuilder},
+ {b("freebsd-amd64-11_1@go1.14", "net"), isBuilder},
+ {b("freebsd-amd64-11_1@go1.14", "mobile"), none},
+ {b("freebsd-amd64-11_1@go1.13", "go"), isBuilder},
+ {b("freebsd-amd64-11_1@go1.13", "net"), isBuilder},
{b("freebsd-amd64-11_1@go1.13", "mobile"), none},
- {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},
// FreeBSD 12.0
{b("freebsd-amd64-12_0", "go"), both},
@@ -488,12 +489,12 @@
{b("darwin-amd64-10_12", "exp"), none},
{b("freebsd-386-10_3@go1.12", "exp"), none},
{b("freebsd-386-10_4@go1.12", "exp"), none},
- {b("freebsd-386-11_1@go1.12", "exp"), none},
+ {b("freebsd-386-11_1@go1.14", "exp"), none},
{b("freebsd-386-11_2", "exp"), none},
{b("freebsd-386-12_0", "exp"), none},
{b("freebsd-amd64-10_3@go1.12", "exp"), none},
{b("freebsd-amd64-10_4@go1.12", "exp"), none},
- {b("freebsd-amd64-11_1@go1.12", "exp"), none},
+ {b("freebsd-amd64-11_1@go1.14", "exp"), none},
{b("freebsd-amd64-11_2", "exp"), none},
{b("freebsd-amd64-12_0", "exp"), none},
{b("openbsd-amd64-62", "exp"), none},
