Skip to content

Use FPEV=... similar to release branches for experimental branches. #4712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 1 commit into from
May 19, 2025
Merged

Use FPEV=... similar to release branches for experimental branches. #4712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions app_dart/lib/src/service/luci_build_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import 'dart:math';
import 'dart:typed_data';

import 'package:buildbucket/buildbucket_pb.dart' as bbv2;
import 'package:cocoon_common/is_release_branch.dart';
import 'package:cocoon_common/task_status.dart';
import 'package:cocoon_server/logging.dart';
import 'package:fixnum/fixnum.dart';
Expand Down Expand Up @@ -861,7 +860,7 @@ class LuciBuildService {
final isFusion = commit.slug == Config.flutterSlug;
if (isFusion) {
processedProperties['is_fusion'] = 'true';
if (isReleaseCandidateBranch(branchName: commit.branch)) {
if (commit.branch != Config.defaultBranch(Config.flutterSlug)) {
processedProperties.addAll({
// Always provide an engine version, just like we do in presubmit.
// See https://github.com/flutter/flutter/issues/167010.
Expand All @@ -870,13 +869,6 @@ class LuciBuildService {
// Prod build bucket, built during the merge queue.
'flutter_realm': '',
});
} else if (commit.branch != Config.defaultBranch(Config.flutterSlug)) {
// Experimental branches do not have:
// - A merge queue that prebuilds binaries for the current SHA
// - A flutter_release_builder pre-step
//
// ... so, just re-use the binaries that were built in presubmit.
processedProperties['flutter_realm'] = 'flutter_archives_v2';
}
}
final propertiesStruct = bbv2.Struct.create();
Expand Down
11 changes: 3 additions & 8 deletions app_dart/test/service/luci_build_service/schedule_prod_builds_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,12 +630,6 @@ void main() {
),
);

expect(
scheduleBuild.properties.fields,
isNot(contains('flutter_prebuilt_engine_version')),
reason: 'Experimental branches use default engine SHA resolution',
);

expect(scheduleBuild.properties.fields, {
'dependencies': bbv2.Value(listValue: bbv2.ListValue()),
'bringup': bbv2.Value(boolValue: false),
Expand All @@ -646,8 +640,9 @@ void main() {
'recipe': bbv2.Value(stringValue: 'devicelab/devicelab'),
'is_fusion': bbv2.Value(stringValue: 'true'),

// Experimental branches use the presubmit bucket for engine builds.
'flutter_realm': bbv2.Value(stringValue: 'flutter_archives_v2'),
// Experimental branches work similar to release branches.
'flutter_prebuilt_engine_version': bbv2.Value(stringValue: '1'),
'flutter_realm': bbv2.Value(stringValue: ''),
});

expect(scheduleBuild.dimensions, [
Expand Down