Skip to content

Commit

Permalink
dashboard: drop the host-freebsd-11_2 builder, remove host-freebsd-11…
Browse files Browse the repository at this point in the history 
…_4 from tryBots for "sys" repo

Updates golang/go#53280
Fixes golang/go#53783

Change-Id: I96a00e6d7733382118f108d31d14f578546639b7
Reviewed-on: https://go-review.googlesource.com/c/build/+/416894
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
  • Loading branch information
@paulzhol @gopherbot
paulzhol authored and gopherbot committed Jul 11, 2022
1 parent 8973f7a commit b6cecd8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 57 deletions.
42 changes: 3 additions & 39 deletions dashboard/builders.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,6 @@ var Hosts = map[string]*HostConfig{
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"},
Owners: []*gophers.Person{gh("4a6f656c")},
},
"host-freebsd-11_2": &HostConfig{
VMImage: "freebsd-amd64-112",
Notes: "FreeBSD 11.2; GCE VM is built from script in build/env/freebsd-amd64",
machineType: "n2-highcpu-4",
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
SSHUsername: "gopher",
},
"host-freebsd-11_4": &HostConfig{
VMImage: "freebsd-amd64-114",
Notes: "FreeBSD 11.4; GCE VM is built from script in build/env/freebsd-amd64",
Expand Down Expand Up @@ -1524,29 +1516,15 @@ func explicitTrySet(projs ...string) func(proj, branch, goBranch string) bool {
}

func init() {
addBuilder(BuildConfig{
Name: "freebsd-amd64-11_2",
HostType: "host-freebsd-11_2",
tryBot: explicitTrySet("sys"),
distTestAdjust: fasterTrybots,
numTryTestHelpers: 4,
buildsRepo: func(repo, branch, goBranch string) bool {
// This builder is still used by Go 1.16 and 1.15,
// so keep it around a bit longer. See golang.org/issue/45727.
// Test relevant Go versions so that we're better informed.
return atMostGo1(goBranch, 16) && buildRepoByDefault(repo)
},
})
addBuilder(BuildConfig{
Name: "freebsd-amd64-11_4",
HostType: "host-freebsd-11_4",
tryBot: explicitTrySet("sys"),
distTestAdjust: fasterTrybots,
numTryTestHelpers: 4,
buildsRepo: func(repo, branch, goBranch string) bool {
// This builder is still used by Go 1.17 and 1.16,
// This builder is still used by Go 1.17,
// keep it around a bit longer. See go.dev/issue/49491.
return atMostGo1(goBranch, 17) && buildRepoByDefault(repo)
return atMostGo1(goBranch, 17) && repo == "go"
},
})
addBuilder(BuildConfig{
Expand Down Expand Up @@ -1583,29 +1561,15 @@ func init() {
distTestAdjust: fasterTrybots,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "freebsd-386-11_2",
HostType: "host-freebsd-11_2",
distTestAdjust: noTestDirAndNoReboot,
tryBot: explicitTrySet("sys"),
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
buildsRepo: func(repo, branch, goBranch string) bool {
// This builder is still used by Go 1.16 and 1.15,
// so keep it around a bit longer. See golang.org/issue/45727.
// Test relevant Go versions so that we're better informed.
return atMostGo1(goBranch, 16) && buildRepoByDefault(repo)
},
})
addBuilder(BuildConfig{
Name: "freebsd-386-11_4",
HostType: "host-freebsd-11_4",
distTestAdjust: noTestDirAndNoReboot,
tryBot: explicitTrySet("sys"),
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
buildsRepo: func(repo, branch, goBranch string) bool {
// This builder is still used by Go 1.17 and 1.16,
// keep it around a bit longer. See go.dev/issue/49491.
return atMostGo1(goBranch, 17) && buildRepoByDefault(repo)
return atMostGo1(goBranch, 17) && repo == "go"
},
})
addBuilder(BuildConfig{
Expand Down
23 changes: 5 additions & 18 deletions dashboard/builders_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,25 +444,12 @@ func TestBuilderConfig(t *testing.T) {
{b("freebsd-386-12_3", "mobile"), none},

// FreeBSD 11.4
{b("freebsd-amd64-11_4@go1.16", "go"), onlyPost},
{b("freebsd-amd64-11_4@go1.16", "net"), onlyPost},
{b("freebsd-amd64-11_4@go1.16", "sys"), both},
{b("freebsd-amd64-11_4", "go"), none},
{b("freebsd-amd64-11_4@go1.17", "go"), onlyPost},
{b("freebsd-amd64-11_4@go1.17", "net"), none},
{b("freebsd-amd64-11_4@go1.17", "sys"), none},
{b("freebsd-386-11_4@go1.17", "go"), onlyPost},
{b("freebsd-386-11_4@go1.17", "net"), onlyPost},
{b("freebsd-386-11_4@go1.17", "sys"), both},
{b("freebsd-386-11_4", "go"), none},

// FreeBSD 11.2
// See golang.org/issue/45727
{b("freebsd-amd64-11_2@go1.15", "go"), onlyPost},
{b("freebsd-amd64-11_2@go1.15", "net"), onlyPost},
{b("freebsd-amd64-11_2@go1.15", "sys"), both},
{b("freebsd-amd64-11_2", "go"), none},
{b("freebsd-386-11_2@go1.16", "go"), onlyPost},
{b("freebsd-386-11_2@go1.16", "net"), onlyPost},
{b("freebsd-386-11_2@go1.16", "sys"), both},
{b("freebsd-386-11_2", "go"), none},
{b("freebsd-386-11_4@go1.17", "net"), none},
{b("freebsd-386-11_4@go1.17", "sys"), none},

// NetBSD
{b("netbsd-amd64-9_0", "go"), onlyPost},
Expand Down

0 comments on commit b6cecd8

Please sign in to comment.