Skip to content

Commit d576fd3

Browse files
committed
dashboard: add macOS 11.0 Big Sur builder
This change adds macOS 11.0 Big Sur builder to the dashboard. It will not spawn an instance on the older MacStadium cluster which we are migrating away from. It will be marked with a known issue until until we have migrated away from the old cluster and makemac has been updated to process the new macOS versioning convention. Updates golang/go#40762 Updates golang/go#40757 Updates golang/go#40761 Change-Id: I24ce615a2c0c55dd75beed4f821119d4058ad8af Reviewed-on: https://go-review.googlesource.com/c/build/+/288192 Trust: Carlos Amedee <[email protected]> Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 49e08c2 commit d576fd3

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

dashboard/builders.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,14 +503,24 @@ var Hosts = map[string]*HostConfig{
503503
},
504504
"host-darwin-10_15": &HostConfig{
505505
IsReverse: true,
506-
ExpectNum: 7,
506+
ExpectNum: 6,
507507
Notes: "MacStadium macOS Catalina (10.15) VM under VMWare ESXi",
508508
env: []string{
509509
"GOROOT_BOOTSTRAP=/Users/gopher/goboot", // Go 1.12.1
510510
},
511511
SSHUsername: "gopher",
512512
HermeticReverse: true, // we destroy the VM when done & let cmd/makemac recreate
513513
},
514+
"host-darwin-amd64-11_0": &HostConfig{
515+
IsReverse: true,
516+
ExpectNum: 1,
517+
Notes: "MacStadium macOS Big Sur (11.0) VM under VMWare ESXi",
518+
env: []string{
519+
"GOROOT_BOOTSTRAP=/Users/gopher/goboot", // Go 1.13.4
520+
},
521+
SSHUsername: "gopher",
522+
HermeticReverse: true, // we destroy the VM when done & let cmd/makemac recreate
523+
},
514524
"host-darwin-arm64-11_0-toothrot": &HostConfig{
515525
IsReverse: true,
516526
ExpectNum: 2,
@@ -2294,6 +2304,13 @@ func init() {
22942304
distTestAdjust: macTestPolicy,
22952305
buildsRepo: defaultPlusExpBuild,
22962306
})
2307+
addBuilder(BuildConfig{
2308+
Name: "darwin-amd64-11_0",
2309+
HostType: "host-darwin-amd64-11_0",
2310+
distTestAdjust: macTestPolicy,
2311+
buildsRepo: defaultPlusExpBuild,
2312+
KnownIssue: 40762,
2313+
})
22972314
addBuilder(BuildConfig{
22982315
Name: "darwin-amd64-nocgo",
22992316
HostType: "host-darwin-10_15",

dashboard/builders_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ func TestTryBotsCompileAllPorts(t *testing.T) {
890890
func TestExpectedMacstadiumVMCount(t *testing.T) {
891891
got := 0
892892
for host, config := range Hosts {
893-
if strings.HasPrefix(host, "host-darwin-10_") {
893+
if strings.HasPrefix(host, "host-darwin-10_") || strings.HasPrefix(host, "host-darwin-amd64-") {
894894
got += config.ExpectNum
895895
}
896896
}

0 commit comments

Comments
 (0)