Skip to content

Commit 3359ca1

Browse files
authored
Remove now unused is_fusion builder properties (#4848)
These are no longer processed by LUCI recipes, including those branched for 3.35 and 3.36.
1 parent 313d810 commit 3359ca1

File tree

4 files changed

+0
-12
lines changed

4 files changed

+0
-12
lines changed

app_dart/lib/src/service/luci_build_service.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ class LuciBuildService {
278278
}
279279

280280
if (isFusion) {
281-
properties['is_fusion'] = 'true';
282-
283281
// Fusion *also* means "this is flutter/flutter", so determine how to specify the engine version and realm.
284282
switch (engineArtifacts) {
285283
case SpecifiedEngineArtifacts(:final commitSha, :final flutterRealm):
@@ -872,7 +870,6 @@ class LuciBuildService {
872870

873871
final isFusion = commit.slug == Config.flutterSlug;
874872
if (isFusion) {
875-
processedProperties['is_fusion'] = 'true';
876873
if (commit.branch != Config.defaultBranch(Config.flutterSlug)) {
877874
processedProperties.addAll({
878875
// For release candidates, let the flutter tool pick the right engine.
@@ -945,7 +942,6 @@ class LuciBuildService {
945942

946943
final cipdExe = 'refs/heads/${mqBranch.branch}';
947944
processedProperties['exe_cipd_version'] = cipdExe;
948-
processedProperties['is_fusion'] = 'true';
949945
processedProperties[kMergeQueueKey] = true;
950946
processedProperties['git_repo'] = commit.slug.name;
951947
if (properties != null) processedProperties.addAll(properties);

app_dart/test/service/luci_build_service/schedule_merge_group_builds_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ Matcher _isExpectedScheduleBuild({required String name}) {
261261
),
262262
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/master'),
263263
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
264-
'is_fusion': bbv2.Value(stringValue: 'true'),
265264
'git_repo': bbv2.Value(stringValue: 'flutter'),
266265
'in_merge_queue': bbv2.Value(boolValue: true),
267266
})

app_dart/test/service/luci_build_service/schedule_prod_builds_test.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ void main() {
329329
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/main'),
330330
'os': bbv2.Value(stringValue: 'debian-10.12'),
331331
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
332-
'is_fusion': bbv2.Value(stringValue: 'true'),
333332
});
334333

335334
expect(scheduleBuild.dimensions, [
@@ -428,7 +427,6 @@ void main() {
428427
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/main'),
429428
'os': bbv2.Value(stringValue: 'debian-10.12'),
430429
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
431-
'is_fusion': bbv2.Value(stringValue: 'true'),
432430
});
433431

434432
expect(scheduleBuild.dimensions, [
@@ -532,7 +530,6 @@ void main() {
532530
),
533531
'os': bbv2.Value(stringValue: 'debian-10.12'),
534532
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
535-
'is_fusion': bbv2.Value(stringValue: 'true'),
536533
// Intentionally omitted: flutter_prebuilt_engine_version
537534
'flutter_realm': bbv2.Value(stringValue: ''),
538535
});
@@ -638,7 +635,6 @@ void main() {
638635
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/main'),
639636
'os': bbv2.Value(stringValue: 'debian-10.12'),
640637
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
641-
'is_fusion': bbv2.Value(stringValue: 'true'),
642638

643639
// Experimental branches work similar to release branches.
644640
'flutter_prebuilt_engine_version': bbv2.Value(stringValue: '1'),

app_dart/test/service/luci_build_service/schedule_try_builds_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ void main() {
140140
'git_repo': bbv2.Value(stringValue: 'flutter'),
141141
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/main'),
142142
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
143-
'is_fusion': bbv2.Value(stringValue: 'true'),
144143
'flutter_prebuilt_engine_version': bbv2.Value(stringValue: 'headsha123'),
145144
'flutter_realm': bbv2.Value(stringValue: 'flutter_archives_v2'),
146145
});
@@ -233,7 +232,6 @@ void main() {
233232
'git_repo': bbv2.Value(stringValue: 'flutter'),
234233
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/main'),
235234
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
236-
'is_fusion': bbv2.Value(stringValue: 'true'),
237235
'flutter_realm': bbv2.Value(stringValue: ''),
238236
});
239237
expect(scheduleBuild.dimensions, [
@@ -326,7 +324,6 @@ void main() {
326324
'git_repo': bbv2.Value(stringValue: 'flutter'),
327325
'exe_cipd_version': bbv2.Value(stringValue: 'refs/heads/main'),
328326
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
329-
'is_fusion': bbv2.Value(stringValue: 'true'),
330327
'flutter_realm': bbv2.Value(stringValue: ''),
331328
});
332329
expect(scheduleBuild.dimensions, [

0 commit comments

Comments
 (0)