Skip to content

Commit 14f081d

Browse files
dmitshurgopherbot
authored andcommitted
dashboard: stop running Windows builders
All of them have been ported to LUCI. Stop running the previous ones. For golang/go#67761. Change-Id: I1ccd262b18cefcc03471e40ccc2659b703721be7 Reviewed-on: https://go-review.googlesource.com/c/build/+/589660 Reviewed-by: Michael Knyszek <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]>
1 parent 5368811 commit 14f081d

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

dashboard/builders_test.go

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ func TestTrybots(t *testing.T) {
100100
"linux-amd64-race",
101101
"linux-arm64",
102102
"openbsd-amd64-72",
103-
"windows-386-2016",
104-
"windows-amd64-2016",
103+
// Stopped.
104+
//"windows-386-2016",
105+
//"windows-amd64-2016",
105106
},
106107
},
107108
{
@@ -115,14 +116,16 @@ func TestTrybots(t *testing.T) {
115116
"linux-amd64-race",
116117
"linux-arm64",
117118
"openbsd-amd64-72",
118-
"windows-386-2016",
119-
"windows-amd64-2016",
119+
// Stopped.
120+
//"windows-386-2016",
121+
//"windows-amd64-2016",
120122

121123
// Include longtest builders on Go repo release branches. See issue 37827.
122124
"linux-386-longtest",
123125
"linux-amd64-longtest",
124126
"linux-arm64-longtest",
125-
"windows-amd64-longtest",
127+
// Stopped.
128+
//"windows-amd64-longtest",
126129
},
127130
},
128131
{
@@ -136,14 +139,16 @@ func TestTrybots(t *testing.T) {
136139
"linux-amd64-race",
137140
"linux-arm64",
138141
"openbsd-amd64-72",
139-
"windows-386-2016",
140-
"windows-amd64-2016",
142+
// Stopped.
143+
//"windows-386-2016",
144+
//"windows-amd64-2016",
141145

142146
// Include longtest builders on Go repo release branches. See issue 37827.
143147
"linux-386-longtest",
144148
"linux-amd64-longtest",
145149
"linux-arm64-longtest",
146-
"windows-amd64-longtest",
150+
// Stopped.
151+
//"windows-amd64-longtest",
147152
},
148153
},
149154
{
@@ -171,8 +176,9 @@ func TestTrybots(t *testing.T) {
171176
"netbsd-amd64-9_3",
172177
"openbsd-386-72",
173178
"openbsd-amd64-72",
174-
"windows-386-2016",
175-
"windows-amd64-2016",
179+
// Stopped.
180+
//"windows-386-2016",
181+
//"windows-amd64-2016",
176182
},
177183
},
178184
{
@@ -181,7 +187,8 @@ func TestTrybots(t *testing.T) {
181187
want: []string{
182188
"linux-amd64",
183189
"linux-amd64-race",
184-
"windows-amd64-2016",
190+
// Stopped.
191+
//"windows-amd64-2016",
185192
},
186193
},
187194
{
@@ -669,7 +676,11 @@ func TestBuilderConfig(t *testing.T) {
669676

670677
gotTry := bc.BuildsRepoTryBot(tt.br.repo, tt.br.branch, tt.br.goBranch)
671678
if tt.want&isTrybot != 0 && !gotTry {
672-
t.Errorf("not trybot, but expected")
679+
if stopped := migration.BuildersPortedToLUCI[bc.Name] && migration.StopPortedBuilder(bc.Name); stopped {
680+
t.Logf("not a trybot builder because it's intentionally stopped")
681+
} else {
682+
t.Errorf("not trybot, but expected")
683+
}
673684
}
674685
if tt.want&notTrybot != 0 && gotTry {
675686
t.Errorf("unexpectedly a trybot")

internal/migration/migration.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ var BuildersPortedToLUCI = map[string]bool{
9191
func StopPortedBuilder(builderName string) (stop bool) {
9292
nameKeyList := []string{
9393
"darwin-",
94+
"windows-",
9495
"linux-loong64",
9596
"linux-ppc64",
9697
"-wasm-",

0 commit comments

Comments
 (0)