dashboard: remove EOL OpenBSD <= 7.0, switch trybots from 7.0 to 7.2

Fixes golang/go#57496.

Change-Id: I5df1ba5c516404c15edcc412fa2f1c5730182b45
GitHub-Last-Rev: ecf1c9b8e2
GitHub-Pull-Request: golang/build#50
Reviewed-on: https://go-review.googlesource.com/c/build/+/459995
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
This commit is contained in:
Aaron Bieber 2023-01-03 15:42:02 +00:00 коммит произвёл Gopher Robot
Родитель 5936c8f831
Коммит 7cd30c4e3f
2 изменённых файлов: 25 добавлений и 115 удалений

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

@ -78,9 +78,9 @@ var slowBotAliases = map[string]string{
"netbsd-arm": "netbsd-arm-bsiegert",
"netbsd-arm64": "netbsd-arm64-bsiegert",
"nocgo": "linux-amd64-nocgo",
"openbsd": "openbsd-amd64-70",
"openbsd-386": "openbsd-386-70",
"openbsd-amd64": "openbsd-amd64-70",
"openbsd": "openbsd-amd64-72",
"openbsd-386": "openbsd-386-72",
"openbsd-amd64": "openbsd-amd64-72",
"openbsd-arm": "openbsd-arm-jsing",
"openbsd-arm64": "openbsd-arm64-jsing",
"openbsd-mips64": "openbsd-mips64-jsing",
@ -459,28 +459,6 @@ var Hosts = map[string]*HostConfig{
Owners: []*gophers.Person{gh("bsiegert")},
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-386-68": {
VMImage: "openbsd-386-68-v3", // v3 adds 009_exit syspatch; see go.dev/cl/278732.
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 6.8 (with 009_exit syspatch); GCE VM, built from build/env/openbsd-386",
SSHUsername: "gopher",
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-386-70": {
VMImage: "openbsd-386-70",
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 7.0; GCE VM, built from build/env/openbsd-386",
SSHUsername: "gopher",
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-386-70-n2d": {
// This host config is only for the runtime team to use investigating golang/go#49209.
VMImage: "openbsd-386-70",
machineType: "n2d", // force AMD; see go.dev/issue/49209
Notes: "OpenBSD 7.0; GCE VM, built from build/env/openbsd-386; AMD",
SSHUsername: "gopher",
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-386-71": {
VMImage: "openbsd-386-71",
machineType: "n2", // force Intel; see go.dev/issue/49209
@ -495,20 +473,6 @@ var Hosts = map[string]*HostConfig{
SSHUsername: "gopher",
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-amd64-68": {
VMImage: "openbsd-amd64-68-v3", // v3 adds 009_exit syspatch; see go.dev/cl/278732.
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 6.8 (with 009_exit syspatch); GCE VM, built from build/env/openbsd-amd64",
SSHUsername: "gopher",
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-amd64-70": {
VMImage: "openbsd-amd64-70",
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 7.0; GCE VM, built from build/env/openbsd-amd64",
SSHUsername: "gopher",
GoBootstrap: "go1.19.2", // Go 1.17 is too old; see go.dev/issue/42422
},
"host-openbsd-amd64-71": {
VMImage: "openbsd-amd64-71",
machineType: "n2", // force Intel; see go.dev/issue/49209
@ -2013,50 +1977,33 @@ func init() {
"GO_DISABLE_OUTBOUND_NETWORK=1",
},
})
addBuilder(BuildConfig{
Name: "openbsd-amd64-68",
HostType: "host-openbsd-amd64-68",
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-68",
HostType: "host-openbsd-386-68",
buildsRepo: func(repo, branch, goBranch string) bool {
if repo == "review" {
// https://go.dev/issue/49529: git seems to be too slow on this
// platform.
return false
}
return buildRepoByDefault(repo)
},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-amd64-70",
HostType: "host-openbsd-amd64-70",
tryBot: defaultTrySet(),
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-amd64-71",
HostType: "host-openbsd-amd64-71",
KnownIssues: []int{57496},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-amd64-72",
HostType: "host-openbsd-amd64-72",
KnownIssues: []int{57496},
tryBot: defaultTrySet(),
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-70",
HostType: "host-openbsd-386-70",
Name: "openbsd-386-71",
HostType: "host-openbsd-386-71",
buildsRepo: func(repo, branch, goBranch string) bool {
// https://go.dev/issue/49529: git seems to be too slow on this
// platform.
return repo != "review" && buildRepoByDefault(repo)
},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-72",
HostType: "host-openbsd-386-72",
tryBot: explicitTrySet("sys"),
buildsRepo: func(repo, branch, goBranch string) bool {
// https://go.dev/issue/49529: git seems to be too slow on this
@ -2066,37 +2013,6 @@ func init() {
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-71",
HostType: "host-openbsd-386-71",
KnownIssues: []int{57496},
buildsRepo: func(repo, branch, goBranch string) bool {
// https://go.dev/issue/49529: git seems to be too slow on this
// platform.
return repo != "review" && buildRepoByDefault(repo)
},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-72",
HostType: "host-openbsd-386-72",
KnownIssues: []int{57496},
buildsRepo: func(repo, branch, goBranch string) bool {
// https://go.dev/issue/49529: git seems to be too slow on this
// platform.
return repo != "review" && buildRepoByDefault(repo)
},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
// This builder is only for the runtime team to use investigating golang/go#49209.
Name: "openbsd-386-70-n2d",
HostType: "host-openbsd-386-70-n2d",
buildsRepo: disabledBuilder,
distTestAdjust: noTestDirAndNoReboot,
})
addBuilder(BuildConfig{
Name: "openbsd-arm-jsing",
HostType: "host-openbsd-arm-joelsing",

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

@ -103,7 +103,7 @@ func TestTrybots(t *testing.T) {
"linux-amd64-unified",
"linux-arm-aws",
"linux-arm64",
"openbsd-amd64-70",
"openbsd-amd64-72",
"windows-386-2008",
"windows-386-2012",
"windows-amd64-2016",
@ -137,7 +137,7 @@ func TestTrybots(t *testing.T) {
"linux-amd64-race",
"linux-arm-aws",
"linux-arm64",
"openbsd-amd64-70",
"openbsd-amd64-72",
"windows-386-2008",
"windows-386-2012",
"windows-amd64-2016",
@ -176,7 +176,7 @@ func TestTrybots(t *testing.T) {
"linux-amd64-race",
"linux-arm-aws",
"linux-arm64",
"openbsd-amd64-70",
"openbsd-amd64-72",
"windows-386-2008-oldcc",
"windows-386-2012-oldcc",
"windows-amd64-2016-oldcc",
@ -224,8 +224,8 @@ func TestTrybots(t *testing.T) {
"linux-arm-aws",
"linux-arm64",
"netbsd-amd64-9_3",
"openbsd-386-70",
"openbsd-amd64-70",
"openbsd-386-72",
"openbsd-amd64-72",
"windows-386-2008",
"windows-amd64-2016",
},
@ -413,13 +413,9 @@ func TestBuilderConfig(t *testing.T) {
{b("linux-loong64-3a5000@go1.18", "sys"), none},
{b("linux-loong64-3a5000", "net"), onlyPost},
// OpenBSD 6.8.
{b("openbsd-amd64-68", "go"), onlyPost},
{b("openbsd-amd64-68@go1.99", "go"), onlyPost},
// OpenBSD 7.0.
{b("openbsd-amd64-70", "go"), both},
{b("openbsd-amd64-70@go1.99", "go"), both},
// OpenBSD 7.2.
{b("openbsd-amd64-72", "go"), both},
{b("openbsd-amd64-72@go1.99", "go"), both},
// FreeBSD 13.0
{b("freebsd-amd64-13_0", "go"), onlyPost},
@ -523,7 +519,6 @@ func TestBuilderConfig(t *testing.T) {
// ... but not on most others:
{b("freebsd-386-12_3", "exp"), none},
{b("freebsd-amd64-12_3", "exp"), none},
{b("openbsd-amd64-68", "exp"), none},
{b("js-wasm", "exp"), none},
// exp is experimental; it doesn't test against release branches.
@ -537,7 +532,6 @@ func TestBuilderConfig(t *testing.T) {
{b("windows-amd64-2016", "build"), both},
{b("darwin-amd64-10_14", "build"), none},
{b("darwin-amd64-10_15", "build"), onlyPost},
{b("openbsd-amd64-68", "build"), none},
{b("linux-amd64-fedora", "build"), none},
{b("linux-amd64-clang", "build"), none},
{b("linux-amd64-sid", "build"), none},