Skip to content

Commit 5dfbda4

Browse files
dmitshurgopherbot
dmitshur
authored and
gopherbot
committed
dashboard: stop running Linux builders
Stop running the Linux builders that have been ported to LUCI. Update some tests so it's viable not to delete them yet. For golang/go#67761. Change-Id: Iec53744970f478a63ec6792c3f46d49b17938ec6 Reviewed-on: https://go-review.googlesource.com/c/build/+/589661 Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Michael Knyszek <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 14f081d commit 5dfbda4

File tree

4 files changed

+72
-52
lines changed

4 files changed

+72
-52
lines changed

‎cmd/coordinator/coordinator_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ func TestXRepoBranches(t *testing.T) {
225225
v := bs.NameAndBranch()
226226
t.Logf("build[%d]: %s", i, v)
227227
}
228-
if len(ts.builds) < 3 {
229-
t.Fatalf("expected at least 3 builders, got %v", len(ts.builds))
228+
if len(ts.builds) == 0 {
229+
t.Fatal("no builders in try set, want at least 1")
230230
}
231231
}
232232

‎cmd/coordinator/internal/legacydash/ui_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ func TestUITemplateDataBuilder(t *testing.T) {
2525
origBuilders := dashboard.Builders
2626
defer func() { dashboard.Builders = origBuilders }()
2727
dashboard.Builders = map[string]*dashboard.BuildConfig{
28-
"linux-amd64": origBuilders["linux-amd64"],
29-
"linux-386": origBuilders["linux-386"],
28+
"linux-amd64": {
29+
Name: "linux-amd64",
30+
HostType: "host-linux-amd64-bullseye",
31+
},
32+
"linux-386": {
33+
Name: "linux-386",
34+
HostType: "host-linux-amd64-bullseye",
35+
},
3036
}
3137

3238
tests := []struct {

‎dashboard/builders_test.go

+61-48
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,13 @@ func TestTrybots(t *testing.T) {
9393
branch: "master",
9494
want: []string{
9595
"freebsd-amd64-12_3",
96-
"linux-386",
97-
"linux-amd64",
98-
"linux-amd64-boringcrypto",
99-
"linux-amd64-newinliner",
100-
"linux-amd64-race",
101-
"linux-arm64",
96+
// Stopped.
97+
//"linux-386",
98+
//"linux-amd64",
99+
//"linux-amd64-boringcrypto",
100+
//"linux-amd64-newinliner",
101+
//"linux-amd64-race",
102+
//"linux-arm64",
102103
"openbsd-amd64-72",
103104
// Stopped.
104105
//"windows-386-2016",
@@ -110,21 +111,22 @@ func TestTrybots(t *testing.T) {
110111
branch: "release-branch.go1.22",
111112
want: []string{
112113
"freebsd-amd64-12_3",
113-
"linux-386",
114-
"linux-amd64",
115-
"linux-amd64-boringcrypto",
116-
"linux-amd64-race",
117-
"linux-arm64",
114+
// Stopped.
115+
//"linux-386",
116+
//"linux-amd64",
117+
//"linux-amd64-boringcrypto",
118+
//"linux-amd64-race",
119+
//"linux-arm64",
118120
"openbsd-amd64-72",
119121
// Stopped.
120122
//"windows-386-2016",
121123
//"windows-amd64-2016",
122124

123125
// Include longtest builders on Go repo release branches. See issue 37827.
124-
"linux-386-longtest",
125-
"linux-amd64-longtest",
126-
"linux-arm64-longtest",
127126
// Stopped.
127+
//"linux-386-longtest",
128+
//"linux-amd64-longtest",
129+
//"linux-arm64-longtest",
128130
//"windows-amd64-longtest",
129131
},
130132
},
@@ -133,21 +135,22 @@ func TestTrybots(t *testing.T) {
133135
branch: "release-branch.go1.21",
134136
want: []string{
135137
"freebsd-amd64-12_3",
136-
"linux-386",
137-
"linux-amd64",
138-
"linux-amd64-boringcrypto",
139-
"linux-amd64-race",
140-
"linux-arm64",
138+
// Stopped.
139+
//"linux-386",
140+
//"linux-amd64",
141+
//"linux-amd64-boringcrypto",
142+
//"linux-amd64-race",
143+
//"linux-arm64",
141144
"openbsd-amd64-72",
142145
// Stopped.
143146
//"windows-386-2016",
144147
//"windows-amd64-2016",
145148

146149
// Include longtest builders on Go repo release branches. See issue 37827.
147-
"linux-386-longtest",
148-
"linux-amd64-longtest",
149-
"linux-arm64-longtest",
150150
// Stopped.
151+
//"linux-386-longtest",
152+
//"linux-amd64-longtest",
153+
//"linux-arm64-longtest",
151154
//"windows-amd64-longtest",
152155
},
153156
},
@@ -157,8 +160,9 @@ func TestTrybots(t *testing.T) {
157160
want: []string{
158161
"android-amd64-emu",
159162
"linux-amd64-androidemu",
160-
"linux-amd64",
161-
"linux-amd64-race",
163+
// Stopped.
164+
//"linux-amd64",
165+
//"linux-amd64-race",
162166
},
163167
},
164168
{
@@ -168,11 +172,12 @@ func TestTrybots(t *testing.T) {
168172
"freebsd-386-13_0",
169173
"freebsd-amd64-12_3",
170174
"freebsd-amd64-13_0",
171-
"linux-386",
172-
"linux-amd64",
173-
"linux-amd64-boringcrypto", // GoDeps will exclude, but not in test
174-
"linux-amd64-race",
175-
"linux-arm64",
175+
// Stopped.
176+
//"linux-386",
177+
//"linux-amd64",
178+
//"linux-amd64-boringcrypto", // GoDeps will exclude, but not in test
179+
//"linux-amd64-race",
180+
//"linux-arm64",
176181
"netbsd-amd64-9_3",
177182
"openbsd-386-72",
178183
"openbsd-amd64-72",
@@ -184,27 +189,29 @@ func TestTrybots(t *testing.T) {
184189
{
185190
repo: "exp",
186191
branch: "master",
187-
want: []string{
188-
"linux-amd64",
189-
"linux-amd64-race",
192+
want: []string{
190193
// Stopped.
194+
//"linux-amd64",
195+
//"linux-amd64-race",
191196
//"windows-amd64-2016",
192197
},
193198
},
194199
{
195200
repo: "vulndb",
196201
branch: "master",
197-
want: []string{
198-
"linux-amd64",
199-
"linux-amd64-race",
202+
want: []string{
203+
// Stopped.
204+
//"linux-amd64",
205+
//"linux-amd64-race",
200206
},
201207
},
202208
{
203209
repo: "website",
204210
branch: "master",
205-
want: []string{
206-
"linux-amd64",
207-
"linux-amd64-race",
211+
want: []string{
212+
// Stopped.
213+
//"linux-amd64",
214+
//"linux-amd64-race",
208215
},
209216
},
210217
}
@@ -256,21 +263,23 @@ func TestPostSubmit(t *testing.T) {
256263
{
257264
repo: "vulndb",
258265
branch: "master",
259-
want: []string{
260-
"linux-amd64",
261-
"linux-amd64-longtest",
262-
"linux-amd64-race",
263-
"linux-amd64-longtest-race",
266+
want: []string{
267+
// Stopped.
268+
//"linux-amd64",
269+
//"linux-amd64-longtest",
270+
//"linux-amd64-race",
271+
//"linux-amd64-longtest-race",
264272
},
265273
},
266274
{
267275
repo: "website",
268276
branch: "master",
269-
want: []string{
270-
"linux-amd64",
271-
"linux-amd64-longtest",
272-
"linux-amd64-race",
273-
"linux-amd64-longtest-race",
277+
want: []string{
278+
// Stopped.
279+
//"linux-amd64",
280+
//"linux-amd64-longtest",
281+
//"linux-amd64-race",
282+
//"linux-amd64-longtest-race",
274283
},
275284
},
276285
}
@@ -731,6 +740,10 @@ func TestBuildsRepoAtAllImplicitGoBranch(t *testing.T) {
731740
}
732741

733742
func TestShouldRunDistTest(t *testing.T) {
743+
if stopped := migration.BuildersPortedToLUCI["linux-amd64"] && migration.StopPortedBuilder("linux-amd64"); stopped {
744+
t.Skip("test can't be used because linux builders are stopped")
745+
}
746+
734747
type buildMode int
735748
const (
736749
tryMode buildMode = 0

‎internal/migration/migration.go

+1
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+
"linux-",
9495
"windows-",
9596
"linux-loong64",
9697
"linux-ppc64",

0 commit comments

Comments
 (0)