dashboard: make website be linux-amd64-only, like vulndb

Also make vulndb run linux-amd64-race.
(Everyone should run the race detector!)

Also make mobile run on linux-amd64 trybot.
It already runs on linux-amd64 post-commit.

Also make mobile run on linux-amd64-race trybot.
(Everyone should run the race detector!)

Also run linux-amd64-longtest-race post-commit
on every repo, just like linux-amd64-longtest does.

Change-Id: I959d8cc2128ae4050b63451ed1e1cf047df172a8
Reviewed-on: https://go-review.googlesource.com/c/build/+/480935
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Russ Cox 2023-03-31 11:27:20 -04:00 коммит произвёл Gopher Robot
Родитель 57dc67da1c
Коммит 208db0ba5f
2 изменённых файлов: 52 добавлений и 23 удалений

Просмотреть файл

@ -1263,9 +1263,7 @@ func buildRepoByDefault(repo string) bool {
case "go":
// Build the main Go repository by default.
return true
case "mobile", "exp", "build", "vulndb", "pkgsite-metrics":
// Don't build the above repos by default.
//
case "build", "exp", "mobile", "pkgsite-metrics", "vulndb", "website":
// Builders need to explicitly opt-in to build these repos.
return false
default:
@ -1275,11 +1273,21 @@ func buildRepoByDefault(repo string) bool {
}
var (
defaultPlusExp = defaultPlus("exp")
defaultPlusExpBuild = defaultPlus("exp", "build")
defaultPlusExpBuildVulnDB = defaultPlus("exp", "build", "vulndb")
defaultPlusExp = defaultPlus("exp")
defaultPlusExpBuild = defaultPlus("exp", "build")
)
// linux-amd64 and linux-amd64-race build all the repos.
// Many team repos are disabled on other builders because
// we only run them on servers and don't need to test the
// many different architectures that Go supports (like ios).
func linuxAmd64Repos(repo, branch, goBranch string) bool {
if repo == "pkgsite-metrics" {
return atLeastGo1(goBranch, 20)
}
return true
}
// defaultPlus returns a buildsRepo policy function that returns true for all
// all the repos listed, plus the default repos.
func defaultPlus(repos ...string) func(repo, branch, goBranch string) bool {
@ -1560,16 +1568,10 @@ func init() {
env: []string{"GOARCH=386", "GOHOSTARCH=386", "GO386=softfloat"},
})
addBuilder(BuildConfig{
Name: "linux-amd64",
HostType: "host-linux-amd64-bullseye",
tryBot: defaultTrySet(),
buildsRepo: func(repo, branch, goBranch string) bool {
b := defaultPlusExpBuildVulnDB(repo, branch, goBranch)
if repo == "pkgsite-metrics" {
b = atLeastGo1(goBranch, 20)
}
return b
},
Name: "linux-amd64",
HostType: "host-linux-amd64-bullseye",
tryBot: defaultTrySet(),
buildsRepo: linuxAmd64Repos,
env: []string{
"GO_DISABLE_OUTBOUND_NETWORK=1",
},
@ -1779,7 +1781,7 @@ func init() {
Name: "linux-amd64-race",
HostType: "host-linux-amd64-bullseye",
tryBot: defaultTrySet(),
buildsRepo: defaultPlusExpBuild,
buildsRepo: linuxAmd64Repos,
distTestAdjust: fasterTrybots,
numTestHelpers: 1,
numTryTestHelpers: 5,
@ -1916,12 +1918,9 @@ func init() {
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
// Test all repos, ignoring buildRepoByDefault.
// For golang.org/x repos, don't test non-latest versions.
return repo == "go" || (branch == "master" && goBranch == "master")
},
env: []string{
"GO_TEST_TIMEOUT_SCALE=5", // Inherited from the longtest builder.

Просмотреть файл

@ -316,6 +316,8 @@ func TestTrybots(t *testing.T) {
want: []string{
"android-amd64-emu",
"linux-amd64-androidemu",
"linux-amd64",
"linux-amd64-race",
},
},
{
@ -379,6 +381,22 @@ func TestTrybots(t *testing.T) {
"windows-amd64-2016",
},
},
{
repo: "vulndb",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-race",
},
},
{
repo: "website",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-race",
},
},
}
for i, tt := range tests {
if tt.branch == "" || tt.repo == "" {
@ -431,6 +449,18 @@ func TestPostSubmit(t *testing.T) {
want: []string{
"linux-amd64",
"linux-amd64-longtest",
"linux-amd64-race",
"linux-amd64-longtest-race",
},
},
{
repo: "website",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-longtest",
"linux-amd64-race",
"linux-amd64-longtest-race",
},
},
}