From 533b1380b33eae3377b3bcc64b39803162592c61 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Mon, 28 Feb 2022 11:43:03 -0800 Subject: [PATCH] dashboard: add linux-amd64-nounified builder This builder is identical to the current linux-amd64-unified builder config, except it sets GOEXPERIMENT=nounified instead to ensure we maintain coverage after switching the default mode. Fixes golang/go#51397. Change-Id: If0ffbf251337db3addce61618784501c7a20283f Reviewed-on: https://go-review.googlesource.com/c/build/+/388494 Trust: Matthew Dempsky Run-TryBot: Matthew Dempsky TryBot-Result: Gopher Robot Reviewed-by: Robert Findley Reviewed-by: Dmitri Shuralyov --- dashboard/builders.go | 20 ++++++++++++++++++++ dashboard/builders_test.go | 9 +++++++++ 2 files changed, 29 insertions(+) diff --git a/dashboard/builders.go b/dashboard/builders.go index 9de74c46..2d2adaa1 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -1750,6 +1750,26 @@ func init() { numTestHelpers: 1, numTryTestHelpers: 4, }) + addBuilder(BuildConfig{ + Name: "linux-amd64-nounified", + HostType: "host-linux-buster", + Notes: "builder with GOEXPERIMENT=nounified, see golang.org/issue/51397", + tryBot: func(repo, branch, goBranch string) bool { + return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams") + }, + buildsRepo: func(repo, branch, goBranch string) bool { + return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams") + }, + env: []string{ + "GO_DISABLE_OUTBOUND_NETWORK=1", + "GOEXPERIMENT=nounified", + }, + GoDeps: []string{ + "804ecc2581caf33ae347d6a1ce67436d1f74e93b", // CL 328215, which added GOEXPERIMENT=unified on dev.typeparams + }, + numTestHelpers: 1, + numTryTestHelpers: 4, + }) addBuilder(BuildConfig{ Name: "linux-amd64-goamd64v3", HostType: "host-linux-bullseye", diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go index 513d9239..f68c7a08 100644 --- a/dashboard/builders_test.go +++ b/dashboard/builders_test.go @@ -99,6 +99,7 @@ func TestTrybots(t *testing.T) { "linux-amd64", "linux-amd64-race", "linux-amd64-unified", + "linux-amd64-nounified", "linux-arm-aws", "linux-arm64-aws", "openbsd-amd64-68", @@ -133,6 +134,7 @@ func TestTrybots(t *testing.T) { "linux-amd64", "linux-amd64-race", "linux-amd64-unified", + "linux-amd64-nounified", "linux-arm-aws", "linux-arm64-aws", "openbsd-amd64-68", @@ -662,6 +664,13 @@ func TestBuilderConfig(t *testing.T) { {b("linux-amd64-unified@dev.typeparams", "go"), both}, {b("linux-amd64-unified@dev.typeparams", "tools"), both}, {b("linux-amd64-unified@dev.typeparams", "net"), none}, + + {b("linux-amd64-nounified", "go"), both}, + {b("linux-amd64-nounified", "tools"), both}, + {b("linux-amd64-nounified", "net"), none}, + {b("linux-amd64-nounified@dev.typeparams", "go"), both}, + {b("linux-amd64-nounified@dev.typeparams", "tools"), both}, + {b("linux-amd64-nounified@dev.typeparams", "net"), none}, } for _, tt := range tests { t.Run(tt.br.testName, func(t *testing.T) {