commit 1a1d5714b86442e273799824180b67685637717a
author Dmitri Shuralyov <dmitshur@golang.org> Fri Jan 10 15:58:25 2020 -0500
committer Dmitri Shuralyov <dmitshur@golang.org> Fri Jan 10 21:35:37 2020 +0000
tree e5bb3a870f915c5e022f6260cc7dcb65d8457f09
parent 220eca8cf4bc9a9f61302fc91a9b9ac367aab4d7

dashboard: include default builds policy in freebsd-386-* builders

It was unintentionally left out, causing these builders
to not skip x/mobile on Go 1.12.

Fixes golang/go#36506

Change-Id: I19a9e2838c8bdaf68fe21151ea9454d1f3062032
Reviewed-on: https://go-review.googlesource.com/c/build/+/214294
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>

dashboard/builders.go

diff --git a/dashboard/builders.go b/dashboard/builders.go
index 447c471..54ce500 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1443,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.12"
+			return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 	})
@@ -1451,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.12"
+			return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 	})
@@ -1460,7 +1460,7 @@
 		HostType:          "host-freebsd-11_1",
 		shouldRunDistTest: noTestDir,
 		buildsRepo: func(repo, branch, goBranch string) bool {
-			return goBranch == "release-branch.go1.12"
+			return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 	})

dashboard/builders_test.go

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 8ea91ec..2bee242 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -314,7 +314,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"), onlyPost}, // TODO(dmitshur, golang.org/issue/36506): accurately refrects current state, but should be changed to none
+		{b("freebsd-386-11_1@go1.12", "mobile"), none}, // This was golang.org/issue/36506.
 
 		{b("android-amd64-emu", "go"), both},
 		{b("android-amd64-emu", "crypto"), both},