Skip to content

Commit 6a04d7e

Browse files
authored
Use FPEV=... similar to release branches for experimental branches. (#4712)
Towards flutter/flutter#169088.
1 parent ad0e119 commit 6a04d7e

2 files changed

Lines changed: 4 additions & 17 deletions

File tree

app_dart/lib/src/service/luci_build_service.dart

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:math';
77
import 'dart:typed_data';
88

99
import 'package:buildbucket/buildbucket_pb.dart' as bbv2;
10-
import 'package:cocoon_common/is_release_branch.dart';
1110
import 'package:cocoon_common/task_status.dart';
1211
import 'package:cocoon_server/logging.dart';
1312
import 'package:fixnum/fixnum.dart';
@@ -861,7 +860,7 @@ class LuciBuildService {
861860
final isFusion = commit.slug == Config.flutterSlug;
862861
if (isFusion) {
863862
processedProperties['is_fusion'] = 'true';
864-
if (isReleaseCandidateBranch(branchName: commit.branch)) {
863+
if (commit.branch != Config.defaultBranch(Config.flutterSlug)) {
865864
processedProperties.addAll({
866865
// Always provide an engine version, just like we do in presubmit.
867866
// See https://github.com/flutter/flutter/issues/167010.
@@ -870,13 +869,6 @@ class LuciBuildService {
870869
// Prod build bucket, built during the merge queue.
871870
'flutter_realm': '',
872871
});
873-
} else if (commit.branch != Config.defaultBranch(Config.flutterSlug)) {
874-
// Experimental branches do not have:
875-
// - A merge queue that prebuilds binaries for the current SHA
876-
// - A flutter_release_builder pre-step
877-
//
878-
// ... so, just re-use the binaries that were built in presubmit.
879-
processedProperties['flutter_realm'] = 'flutter_archives_v2';
880872
}
881873
}
882874
final propertiesStruct = bbv2.Struct.create();

app_dart/test/service/luci_build_service/schedule_prod_builds_test.dart

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,6 @@ void main() {
630630
),
631631
);
632632

633-
expect(
634-
scheduleBuild.properties.fields,
635-
isNot(contains('flutter_prebuilt_engine_version')),
636-
reason: 'Experimental branches use default engine SHA resolution',
637-
);
638-
639633
expect(scheduleBuild.properties.fields, {
640634
'dependencies': bbv2.Value(listValue: bbv2.ListValue()),
641635
'bringup': bbv2.Value(boolValue: false),
@@ -646,8 +640,9 @@ void main() {
646640
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
647641
'is_fusion': bbv2.Value(stringValue: 'true'),
648642

649-
// Experimental branches use the presubmit bucket for engine builds.
650-
'flutter_realm': bbv2.Value(stringValue: 'flutter_archives_v2'),
643+
// Experimental branches work similar to release branches.
644+
'flutter_prebuilt_engine_version': bbv2.Value(stringValue: '1'),
645+
'flutter_realm': bbv2.Value(stringValue: ''),
651646
});
652647

653648
expect(scheduleBuild.dimensions, [

0 commit comments

Comments
 (0)