Skip to content

Commit 95bc93b

Browse files
committed
dashboard: remove vetall, update misc-compile builders
Updates golang/go#31916 Change-Id: I38c08955bdb4ff2b0963d5c91c6e8f78267b8004 Reviewed-on: https://go-review.googlesource.com/c/build/+/176599 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 52dbde8 commit 95bc93b

File tree

2 files changed

+30
-35
lines changed

2 files changed

+30
-35
lines changed

dashboard/builders.go

+22-28
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ func (c *BuildConfig) IsLongTest() bool {
870870
// allowed to make outbound network requests. This is only enforced
871871
// on some builders. (Currently most Linux ones)
872872
func (c *BuildConfig) OutboundNetworkAllowed() bool {
873-
return c.Name == "misc-vet-vetall" || c.IsLongTest()
873+
return c.IsLongTest()
874874
}
875875

876876
func (c *BuildConfig) GoInstallRacePackages() []string {
@@ -1381,22 +1381,11 @@ func init() {
13811381
})
13821382
}
13831383

1384-
// Add the -vetall builder. The builder name suffix "-vetall" is recognized by cmd/dist/test.go
1385-
// to only run the "go vet std cmd" test and no others.
1386-
addBuilder(BuildConfig{
1387-
Name: "misc-vet-vetall",
1388-
HostType: "host-linux-jessie",
1389-
Notes: "Runs vet over the standard library.",
1390-
buildsRepo: func(repo, branch, goBranch string) bool {
1391-
return repo == "go" && branch == "master"
1392-
},
1393-
tryBot: defaultTrySet(),
1394-
env: []string{
1395-
"GO_DISABLE_OUTBOUND_NETWORK=1",
1396-
},
1397-
numTestHelpers: 5,
1398-
})
1399-
1384+
// addMiscCompile adds a misc-compile builder that runs
1385+
// buildall.bash on a subset of platforms matching the egrep
1386+
// pattern rx. The pattern is matched against the "go tool
1387+
// dist list" name, but with hyphens instead of forward
1388+
// slashes ("linux-amd64", etc).
14001389
addMiscCompile := func(suffix, rx string) {
14011390
addBuilder(BuildConfig{
14021391
Name: "misc-compile" + suffix,
@@ -1407,23 +1396,28 @@ func init() {
14071396
},
14081397
tryOnly: true,
14091398
CompileOnly: true,
1410-
Notes: "Runs buildall.sh to cross-compile std packages for " + rx + ", but doesn't run any tests.",
1399+
Notes: "Runs buildall.sh to cross-compile & vet std+cmd packages for " + rx + ", but doesn't run any tests.",
14111400
allScriptArgs: []string{
14121401
// Filtering pattern to buildall.bash:
14131402
rx,
14141403
},
14151404
})
14161405
}
1417-
addMiscCompile("", "^(linux-arm64|linux-s390x|solaris-amd64|darwin-386)$") // 4 ports
1418-
addMiscCompile("-nacl", "^nacl") // 3
1419-
addMiscCompile("-mips", "^linux-mips") // 4
1420-
addMiscCompile("-ppc", "^linux-ppc64") // 2
1421-
addMiscCompile("-plan9", "^plan9-") // 3
1422-
addMiscCompile("-freebsd", "^freebsd-") // 3
1423-
addMiscCompile("-netbsd", "^netbsd-") // 3
1424-
addMiscCompile("-openbsd", "^openbsd-") // 3
1425-
// TODO: Issue 25963, get the misc-compile trybots for mobile working, and then:
1426-
// addMiscCompile("-mobile", "(^android|darwin-arm64)") // 5 ports
1406+
addMiscCompile("-linuxarm", "^linux-arm") // 2: arm, arm64
1407+
addMiscCompile("-darwin", "^darwin") // 4: 386, amd64 + iOS: armb, arm64
1408+
addMiscCompile("-nacl", "^nacl") // 3: arm, 386, amd64p32
1409+
addMiscCompile("-mips", "^linux-mips") // 4: mips, mipsle, mips64, mips64le
1410+
addMiscCompile("-ppc", "^(linux-ppc64|aix-)") // 3: linux-ppc64{,le}, aix-ppc64
1411+
addMiscCompile("-solaris", "^(solaris|illumos)") // 2: both amd64
1412+
addMiscCompile("-plan9", "^plan9-") // 3: amd64, 386, arm
1413+
addMiscCompile("-freebsd", "^freebsd-(386|arm)") // 2: 386, arm (amd64 already trybot)
1414+
addMiscCompile("-netbsd", "^netbsd-") // 4: amd64, 386, arm, arm64
1415+
addMiscCompile("-openbsd", "^openbsd-") // 4: amd64, 386, arm, arm64
1416+
// And 3 that don't fit above:
1417+
addMiscCompile("-other", "^(windows-arm|linux-s390x|dragonfly-amd64)$")
1418+
// TODO: Issue 25963, get the misc-compile trybots for
1419+
// subrepos too, so "mobile" can at least be included as a
1420+
// misc-compile for ^android- and ^darwin-arm.
14271421

14281422
addBuilder(BuildConfig{
14291423
Name: "linux-amd64-nocgo",

dashboard/builders_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,17 @@ func TestTrybots(t *testing.T) {
8989
"linux-386",
9090
"linux-amd64",
9191
"linux-amd64-race",
92-
"misc-compile",
92+
"misc-compile-other",
93+
"misc-compile-darwin",
94+
"misc-compile-linuxarm",
95+
"misc-compile-solaris",
9396
"misc-compile-freebsd",
9497
"misc-compile-mips",
9598
"misc-compile-nacl",
9699
"misc-compile-netbsd",
97100
"misc-compile-openbsd",
98101
"misc-compile-plan9",
99102
"misc-compile-ppc",
100-
"misc-vet-vetall",
101103
"nacl-amd64p32",
102104
"openbsd-amd64-64",
103105
"windows-386-2008",
@@ -114,14 +116,17 @@ func TestTrybots(t *testing.T) {
114116
"linux-386",
115117
"linux-amd64",
116118
"linux-amd64-race",
117-
"misc-compile",
119+
"misc-compile-darwin",
118120
"misc-compile-freebsd",
121+
"misc-compile-linuxarm",
119122
"misc-compile-mips",
120123
"misc-compile-nacl",
121124
"misc-compile-netbsd",
122125
"misc-compile-openbsd",
126+
"misc-compile-other",
123127
"misc-compile-plan9",
124128
"misc-compile-ppc",
129+
"misc-compile-solaris",
125130
"nacl-amd64p32",
126131
"openbsd-amd64-64",
127132
"windows-386-2008",
@@ -262,10 +267,6 @@ func TestBuilderConfig(t *testing.T) {
262267
{b("linux-amd64", "net"), both},
263268
{b("linux-amd64", "sys"), both},
264269

265-
{b("misc-vet-vetall", "go"), both},
266-
{b("[email protected]", "go"), none},
267-
{b("[email protected]", "go"), none},
268-
269270
// Don't test all subrepos on all the builders.
270271
{b("linux-amd64-ssacheck", "net"), none},
271272
{b("[email protected]", "net"), none},

0 commit comments

Comments
 (0)