dashboard: include longtest builders for trybots on release branches

The goal of this test policy change is to decrease the chance of a Go repository release branch from getting into a state where some longtest post-submit builders are failing, as this will interfere with the ability to issue releases after golang/go#29252 is fixed. There are not that many CLs sent to release branches, so the extra latency caused by slower longtest builders being a part of trybots should not be very disruptive. For golang/go#37827. For golang/go#29252. Change-Id: I819b120bb7b763df4acf4583375cdb840793d323 Reviewed-on: https://go-review.googlesource.com/c/build/+/235338 Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]> Reviewed-by: Carlos Amedee <[email protected]>
golang · Jun 2, 2020 · 5a8fb63 · 5a8fb63
1 parent 1475309
commit 5a8fb63
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -1759,6 +1759,10 @@ func init() {
 		Name:     "linux-amd64-longtest",
 		HostType: "host-linux-stretch-morecpu",
 		Notes:    "Debian Stretch with go test -short=false",
+		tryBot: func(repo, branch, goBranch string) bool {
+			onReleaseBranch := strings.HasPrefix(branch, "release-branch.")
+			return repo == "go" && onReleaseBranch // See issue 37827.
+		},
 		buildsRepo: func(repo, branch, goBranch string) bool {
 			return repo == "go" || (branch == "master" && goBranch == "master")
 		},
@@ -1771,6 +1775,10 @@ func init() {
 		Name:     "linux-386-longtest",
 		HostType: "host-linux-stretch-morecpu",
 		Notes:    "Debian Stretch with go test -short=false; to get 32-bit coverage",
+		tryBot: func(repo, branch, goBranch string) bool {
+			onReleaseBranch := strings.HasPrefix(branch, "release-branch.")
+			return repo == "go" && onReleaseBranch // See issue 37827.
+		},
 		buildsRepo: func(repo, branch, goBranch string) bool {
 			if repo == "build" {
 				return false
@@ -2074,6 +2082,10 @@ func init() {
 		Name:     "windows-amd64-longtest",
 		HostType: "host-windows-amd64-2016-big",
 		Notes:    "Windows Server 2016 with go test -short=false",
+		tryBot: func(repo, branch, goBranch string) bool {
+			onReleaseBranch := strings.HasPrefix(branch, "release-branch.")
+			return repo == "go" && onReleaseBranch // See issue 37827.
+		},
 		buildsRepo: func(repo, branch, goBranch string) bool {
 			if !defaultPlusExpBuild(repo, branch, goBranch) {
 				return false

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
@@ -158,6 +158,11 @@ func TestTrybots(t *testing.T) {
 				"openbsd-amd64-64",
 				"windows-386-2008",
 				"windows-amd64-2016",
+
+				// Include longtest builders on Go repo release branches. See issue 37827.
+				"linux-386-longtest",
+				"linux-amd64-longtest",
+				"windows-amd64-longtest",
 			},
 		},
 		{
@@ -459,10 +464,10 @@ func TestBuilderConfig(t *testing.T) {
 		// Long test.
 		{b("linux-amd64-longtest", "go"), onlyPost},
 		{b("linux-amd64-longtest", "net"), onlyPost},
-		{b("[email protected]", "go"), onlyPost},
+		{b("[email protected]", "go"), both},
 		{b("[email protected]", "net"), none},
 		{b("windows-amd64-longtest", "go"), onlyPost},
-		{b("[email protected]", "go"), onlyPost},
+		{b("[email protected]", "go"), both},
 		{b("windows-amd64-longtest", "net"), onlyPost},
 		{b("windows-amd64-longtest", "exp"), onlyPost},
 		{b("windows-amd64-longtest", "mobile"), none},