dashboard: add linux-amd64-longtest-race builder

This builder runs the longtest test with the race detector turned on to
identify races in -short=false tests.

Fixes golang/go#54630.

Change-Id: I6fabaa43522a4294f3a23e98ae0f436d4cc153d8
Reviewed-on: https://go-review.googlesource.com/c/build/+/449196
Reviewed-by: Heschi Kreinick <[email protected]>
Run-TryBot: Michael Knyszek <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>

Author: mknyszek

cmd/coordinator/internal/legacydash/ui.go

@@ -889,7 +889,15 @@ func builderSubheading(s string) string {
 // For race builders it returns the empty string.
 func builderSubheading2(s string) string {
 	if isRace(s) {
-		return ""
+		// Remove "race" and just take whatever the third component is after.
+		var split []string
+		for _, sc := range strings.Split(s, "-") {
+			if sc == "race" {
+				continue
+			}
+			split = append(split, sc)
+		}
+		s = strings.Join(split, "-")
 	}
 	_, secondThird := splitDash(s)
 	_, third := splitDash(secondThird)

dashboard/builders.go

@@ -1032,17 +1032,34 @@ func (c *HostConfig) BuildletBinaryURL(e *buildenv.Environment) string {
 	return "https://storage.googleapis.com/" + e.BuildletBucket + "/buildlet." + c.HostArch
 }
 
+// IsRace reports whether this is a race builder.
+// A race builder runs tests without the -short flag.
+//
+// A builder is considered to be a race builder
+// if and only if it one of the components of the builder
+// name is "race" (components are delimited by "-").
 func (c *BuildConfig) IsRace() bool {
-	return strings.HasSuffix(c.Name, "-race")
+	for _, s := range strings.Split(c.Name, "-") {
+		if s == "race" {
+			return true
+		}
+	}
+	return false
 }
 
 // IsLongTest reports whether this is a longtest builder.
 // A longtest builder runs tests without the -short flag.
 //
 // A builder is considered to be a longtest builder
-// if and only if its name ends with "-longtest".
+// if and only if it one of the components of the builder
+// name is "longtest" (components are delimited by "-").
 func (c *BuildConfig) IsLongTest() bool {
-	return strings.HasSuffix(c.Name, "-longtest")
+	for _, s := range strings.Split(c.Name, "-") {
+		if s == "longtest" {
+			return true
+		}
+	}
+	return false
 }
 
 // OutboundNetworkAllowed reports whether this builder should be
@@ -1863,6 +1880,23 @@ func init() {
 		},
 		numTryTestHelpers: 4, // Target time is < 15 min for go.dev/issue/42661.
 	})
+	addBuilder(BuildConfig{
+		Name:     "linux-amd64-longtest-race",
+		HostType: "host-linux-amd64-bullseye",
+		Notes:    "Debian Bullseye with the race detector enabled and go test -short=false",
+		buildsRepo: func(repo, branch, goBranch string) bool {
+			b := buildRepoByDefault(repo)
+			if repo != "go" && !(branch == "master" && goBranch == "master") {
+				// For golang.org/x repos, don't test non-latest versions.
+				b = false
+			}
+			return b
+		},
+		needsGoProxy: true, // for cmd/go module tests
+		env: []string{
+			"GO_TEST_TIMEOUT_SCALE=5", // Inherited from the longtest builder.
+		},
+	})
 	addBuilder(BuildConfig{
 		Name:     "linux-386-longtest",
 		HostType: "host-linux-amd64-bullseye",

dashboard/builders_test.go

@@ -894,24 +894,49 @@ func TestExpectedMacstadiumVMCount(t *testing.T) {
 	}
 }
 
-// Test that we have a longtest builder and
-// that its environment configuration is okay.
+// Test that we have longtest builders and
+// that their environment configurations are okay.
 func TestLongTestBuilder(t *testing.T) {
-	long, ok := Builders["linux-amd64-longtest"]
-	if !ok {
-		t.Fatal("we don't have a linux-amd64-longtest builder anymore, is that intentional?")
-	}
-	if !long.IsLongTest() {
-		t.Error("the linux-amd64-longtest builder isn't a longtest builder, is that intentional?")
-	}
-	var shortDisabled bool
-	for _, e := range long.Env() {
-		if e == "GO_TEST_SHORT=0" {
-			shortDisabled = true
-		}
+	for _, name := range []string{"linux-amd64-longtest", "linux-amd64-longtest-race"} {
+		name := name
+		t.Run(name, func(t *testing.T) {
+			long, ok := Builders[name]
+			if !ok {
+				t.Fatalf("we don't have a %s builder anymore, is that intentional?", name)
+			}
+			if !long.IsLongTest() {
+				t.Errorf("the %s builder isn't a longtest builder, is that intentional?", name)
+			}
+			var shortDisabled bool
+			for _, e := range long.Env() {
+				if e == "GO_TEST_SHORT=0" {
+					shortDisabled = true
+				}
+			}
+			if !shortDisabled {
+				t.Errorf("the %s builder doesn't set GO_TEST_SHORT=0, is that intentional?", name)
+			}
+		})
 	}
-	if !shortDisabled {
-		t.Error("the linux-amd64-longtest builder doesn't set GO_TEST_SHORT=0, is that intentional?")
+}
+
+// Test that we have race builders and
+// that their environment configurations are okay.
+func TestRaceBuilder(t *testing.T) {
+	for _, name := range []string{"linux-amd64-race", "linux-amd64-longtest-race"} {
+		name := name
+		t.Run(name, func(t *testing.T) {
+			race, ok := Builders[name]
+			if !ok {
+				t.Fatalf("we don't have a %s builder anymore, is that intentional?", name)
+			}
+			if !race.IsRace() {
+				t.Errorf("the %s builder isn't a race builder, is that intentional?", name)
+			}
+			if script := race.AllScript(); !strings.Contains(script, "race") {
+				t.Errorf("the %s builder doesn't use race.bash or race.bat, it uses %s instead, is that intentional?", name, script)
+			}
+		})
 	}
 }