Skip to content

Commit 76eb641

Browse files
toothrottoothrot
committed
dashboard,cmd/release: replace windows-arm64-aws with windows-arm64-10
This change removes the windows-arm64-aws buildlet and replaces all usages with the windows-arm64-10 buildlet. - Remove the known issue from the windows-arm64-10 buildlet, which has been passing reliably. - Enable tests during releases, and add a slowbot alias, as it's a much faster buildlet. Updates golang/go#46502 For golang/go#42604 Change-Id: Ib9f7c3d5391b01e303b43bbdad030b3f94147c5d Reviewed-on: https://go-review.googlesource.com/c/build/+/331670 Trust: Alexander Rakoczy <[email protected]> Run-TryBot: Alexander Rakoczy <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Carlos Amedee <[email protected]>
1 parent 5a88d95 commit 76eb641

File tree

4 files changed

+17
-37
lines changed

4 files changed

+17
-37
lines changed

‎cmd/coordinator/coordinator_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -254,33 +254,33 @@ func TestIssue42084(t *testing.T) {
254254
hasWindowsARM64Builder := false
255255
for _, bs := range ts.builds {
256256
v := bs.NameAndBranch()
257-
if v == "windows-arm64-aws" {
257+
if v == "windows-arm64-10" {
258258
hasWindowsARM64Builder = true
259259
}
260260
}
261261
if hasWindowsARM64Builder {
262-
// This test relies on windows-arm64-aws builder not being default TryBot
263-
// to provide coverage for issue 42084. If the build policy changes, need
264-
// to pick another builder to use in this test.
265-
t.Fatal("windows-arm64-aws builder was included even without TRY= message")
262+
// This test relies on windows-arm64-10 builder not being a default
263+
// TryBot to provide coverage for issue 42084. If the build policy
264+
// changes, need to pick another builder to use in this test.
265+
t.Fatal("windows-arm64-10 builder was included even without TRY= message")
266266
}
267267

268268
// Next, add try messages, and check that the SlowBot is now included.
269269
work.TryMessage = []*apipb.TryVoteMessage{
270-
{Message: "TRY=windows-arm64,windows-amd64", AuthorId: 1234, Version: 1},
271-
{Message: "TRY=windows-arm64-aws", AuthorId: 1234, Version: 1},
270+
{Message: "TRY=windows-amd64", AuthorId: 1234, Version: 1},
271+
{Message: "TRY=windows-arm64-10", AuthorId: 1234, Version: 1},
272272
}
273273
ts = newTrySet(work)
274274
hasWindowsARM64Builder = false
275275
for i, bs := range ts.builds {
276276
v := bs.NameAndBranch()
277277
t.Logf("build[%d]: %s", i, v)
278-
if v == "windows-arm64-aws" {
278+
if v == "windows-arm64-10" {
279279
hasWindowsARM64Builder = true
280280
}
281281
}
282282
if !hasWindowsARM64Builder {
283-
t.Error("windows-arm64-aws SlowBot was not included")
283+
t.Error("windows-arm64-10 SlowBot was not included")
284284
}
285285
}
286286

‎cmd/release/release.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ var builds = []*Build{
205205
OS: "windows",
206206
Arch: "arm64",
207207
Race: false, // Not supported as of 2021-06-01.
208-
Builder: "windows-arm64-aws",
209-
210-
// TODO(golang.org/issue/46406, golang.org/issue/46502): Fix or skip failing tests,
211-
// ensure the builder is fast enough to complete tests, then remove SkipTests here.
208+
Builder: "windows-arm64-10",
209+
// TODO(golang.org/issue/46406, golang.org/issue/46502): Fix
210+
// or skip failing tests, ensure the builder is fast enough to
211+
// complete tests, then remove SkipTests here.
212212
SkipTests: true,
213213
},
214214
{

‎dashboard/builders.go

+2-22
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ import (
2525
// syntax entirely. This is a first draft.
2626
var slowBotAliases = map[string]string{
2727
// Known missing builders:
28-
"ios-amd64": "", // There is no builder for the iOS Simulator. See issues 42100 and 42177.
29-
"windows-arm64": "", // TODO(golang.org/issue/42604): Add builder for windows/arm64.
28+
"ios-amd64": "", // There is no builder for the iOS Simulator. See issues 42100 and 42177.
3029

3130
"386": "linux-386",
3231
"aix": "aix-ppc64",
@@ -97,6 +96,7 @@ var slowBotAliases = map[string]string{
9796
"windows-386": "windows-386-2008",
9897
"windows-amd64": "windows-amd64-2016",
9998
"windows-arm": "windows-arm-zx2c4",
99+
"windows-arm64": "windows-arm64-10",
100100
}
101101

102102
// Builders are the different build configurations.
@@ -466,16 +466,6 @@ var Hosts = map[string]*HostConfig{
466466
OwnerGithub: "zx2c4",
467467
env: []string{"GOROOT_BOOTSTRAP=C:\\Program Files (Arm)\\Go"},
468468
},
469-
"host-windows-arm64-qemu": &HostConfig{
470-
Notes: "Ubuntu hosting Windows 10 in qemu with KVM, EC2 ARM64 instance. See x/build/env/windows-arm64/aws",
471-
VMImage: "ami-0203852dc6efbfb68",
472-
SSHUsername: "gopher", // Windows username is gopher, linux is ubuntu.
473-
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.windows-arm64",
474-
env: []string{"GOARCH=arm64"},
475-
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-windows-arm64-f22ec5.tar.gz",
476-
isEC2: true,
477-
machineType: "a1.metal",
478-
},
479469
"host-windows-arm64-mini": &HostConfig{
480470
Notes: "macOS hosting Windows 10 in qemu with HVM acceleration.",
481471
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.windows-arm64",
@@ -2305,23 +2295,13 @@ func init() {
23052295
"GOARM=7",
23062296
"GO_TEST_TIMEOUT_SCALE=3"},
23072297
})
2308-
addBuilder(BuildConfig{
2309-
Name: "windows-arm64-aws",
2310-
HostType: "host-windows-arm64-qemu",
2311-
numTryTestHelpers: 1,
2312-
buildsRepo: func(repo, branch, goBranch string) bool {
2313-
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
2314-
},
2315-
KnownIssue: 42604,
2316-
})
23172298
addBuilder(BuildConfig{
23182299
Name: "windows-arm64-10",
23192300
HostType: "host-windows-arm64-mini",
23202301
numTryTestHelpers: 1,
23212302
buildsRepo: func(repo, branch, goBranch string) bool {
23222303
return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
23232304
},
2324-
KnownIssue: 42604,
23252305
})
23262306
addBuilder(BuildConfig{
23272307
Name: "darwin-amd64-10_12",

‎maintner/maintnerd/maintapi/api_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,15 @@ func TestTryWorkItem(t *testing.T) {
267267
},
268268
{
269269
PatchSet: 1,
270-
Message: "TRY=windows-arm64-aws",
270+
Message: "TRY=windows-arm64-10",
271271
Updated: gerrit.TimeStamp(time.Date(2021, 6, 3, 19, 16, 26, 0, time.UTC)),
272272
Author: &gerrit.AccountInfo{NumericID: 1234},
273273
},
274274
},
275275
},
276276
want: `project:"go" branch:"master" change_id:"I023d5208374f867552ba68b45011f7990159868f" commit:"dd38fd80c3667f891dbe06bd1d8ed153c2e208da" version:1 go_version:<major:1 minor:17 > ` +
277277
`try_message:<message:"windows-arm64,windows-amd64" author_id:1234 version:1 > ` +
278-
`try_message:<message:"windows-arm64-aws" author_id:1234 version:1 > `,
278+
`try_message:<message:"windows-arm64-10" author_id:1234 version:1 > `,
279279
},
280280
}
281281
for _, tt := range tests {

0 commit comments

Comments
 (0)