implementaiton of re-run unified check run

ievdokdm · ievdokdm · commit 06c9b8ddde01 · 2026-01-21T17:18:28.000-08:00
diff --git a/app_dart/lib/src/model/common/failed_presubmit_checks.dart b/app_dart/lib/src/model/common/failed_presubmit_checks.dart
@@ -0,0 +1,34 @@
+// Copyright 2026 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// @docImport 'failed_presubmit_checks.dart';
+library;
+
+import 'package:github/github.dart';
+
+/// Contains the list of failed checks that are proposed to be re-run.
+///
+/// See: [UnifiedCheckRun.reInitializeFailedChecks]
+class FailedChecksForRerun {
+  final CheckRun checkRunGuard;
+  final List<String> checkNames;
+
+  const FailedChecksForRerun({
+    required this.checkRunGuard,
+    required this.checkNames,
+  });
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is FailedChecksForRerun &&
+          other.checkRunGuard == checkRunGuard &&
+          other.checkNames == checkNames);
+
+  @override
+  int get hashCode => Object.hashAll([checkRunGuard, checkNames]);
+
+  @override
+  String toString() => 'FailedChecksForRerun("$checkRunGuard", "$checkNames")';
+}
diff --git a/app_dart/lib/src/model/firestore/presubmit_check.dart b/app_dart/lib/src/model/firestore/presubmit_check.dart
@@ -15,8 +15,6 @@ import '../../service/firestore.dart';
 import '../bbv2_extension.dart';
 import 'base.dart';
 
-const String collectionId = 'presubmit_checks';
-
 @immutable
 final class PresubmitCheckId extends AppDocumentId<PresubmitCheck> {
   PresubmitCheckId({
@@ -87,6 +85,7 @@ final class PresubmitCheckId extends AppDocumentId<PresubmitCheck> {
 }
 
 final class PresubmitCheck extends AppDocument<PresubmitCheck> {
+  static const collectionId = 'presubmit_checks';
   static const fieldCheckRunId = 'checkRunId';
   static const fieldBuildName = 'buildName';
   static const fieldBuildNumber = 'buildNumber';
@@ -181,10 +180,11 @@ final class PresubmitCheck extends AppDocument<PresubmitCheck> {
     required String buildName,
     required int checkRunId,
     required int creationTime,
+    int? attemptNumber,
   }) {
     return PresubmitCheck(
       buildName: buildName,
-      attemptNumber: 1,
+      attemptNumber: attemptNumber ?? 1,
       checkRunId: checkRunId,
       creationTime: creationTime,
       status: TaskStatus.waitingForBackfill,
diff --git a/app_dart/lib/src/service/firestore/unified_check_run.dart b/app_dart/lib/src/service/firestore/unified_check_run.dart
@@ -11,6 +11,7 @@ import 'package:collection/collection.dart';
 import 'package:github/github.dart';
 import 'package:googleapis/firestore/v1.dart' hide Status;
 
+import '../../model/common/failed_presubmit_checks.dart';
 import '../../model/common/presubmit_check_state.dart';
 import '../../model/common/presubmit_guard_conclusion.dart';
 import '../../model/firestore/base.dart';
@@ -76,6 +77,87 @@ final class UnifiedCheckRun {
     }
   }
 
+  static Future<FailedChecksForRerun> reInitializeFailedChecks({
+    required FirestoreService firestoreService,
+    required RepositorySlug slug,
+    required CiStage stage,
+    required PullRequest pullRequest,
+    required int checkRunId,
+  }) async {
+    final logCrumb =
+        'reInitializeFailedChecks(${slug.fullName}, $stage, ${pullRequest.number}, $checkRunId)';
+
+    log.info('$logCrumb Re-Running failed checks.');
+    final transaction = await firestoreService.beginTransaction();
+    final guardDocumentName = PresubmitGuard.documentNameFor(
+      slug: slug,
+      pullRequestId: pullRequest.number!,
+      checkRunId: checkRunId,
+      stage: stage,
+    );
+    final guardDocument = await firestoreService.getDocument(
+      guardDocumentName,
+      transaction: transaction,
+    );
+    final guard = PresubmitGuard.fromDocument(guardDocument);
+
+    final failedBuilds = guard.builds?.entries
+        .where((entry) => entry.value.isFailure)
+        .map((entry) => entry.key)
+        .toList();
+
+    if (failedBuilds == null || failedBuilds.isEmpty) {
+      log.info('$logCrumb No failed builds found.');
+      return FailedChecksForRerun(
+        checkRunGuard: guard.checkRun,
+        checkNames: [],
+      );
+    }
+
+    final checks = [
+      for (final buildName in failedBuilds)
+        PresubmitCheck.init(
+          buildName: buildName,
+          checkRunId: checkRunId,
+          creationTime: pullRequest.createdAt!.microsecondsSinceEpoch,
+          attemptNumber:
+              ((await getLatestPresubmitCheck(
+                    firestoreService: firestoreService,
+                    checkRunId: checkRunId,
+                    buildName: buildName,
+                    transaction: transaction,
+                  ))?.attemptNumber ??
+                  0) +
+              1, // Increment the latest attempt number.
+        ),
+    ];
+
+    guard.failedBuilds = 0;
+    guard.remainingBuilds = failedBuilds.length;
+    final builds = guard.builds!;
+    for (final buildName in failedBuilds) {
+      builds[buildName] = TaskStatus.waitingForBackfill;
+    }
+    guard.builds = builds;
+
+    try {
+      final response = await firestoreService.commit(
+        transaction,
+        documentsToWrites([...checks, guard]),
+      );
+      log.info(
+        '$logCrumb: results = ${response.writeResults?.map((e) => e.toJson())}',
+      );
+      return FailedChecksForRerun(
+        checkRunGuard: guard.checkRun,
+        checkNames: failedBuilds,
+      );
+    } catch (e) {
+      log.info('$logCrumb: failed to update presubmit check', e);
+      rethrow;
+    }
+  }
+
   /// Returns _all_ checks running against the specified github [checkRunId].
   static Future<List<PresubmitCheck>> queryAllPresubmitChecksForGuard({
     required FirestoreService firestoreService,
@@ -112,25 +194,47 @@ final class UnifiedCheckRun {
     )).firstOrNull;
   }
 
+  /// Returns the latest check for the specified github [checkRunId] and
+  /// [buildName].
+  static Future<PresubmitCheck?> getLatestPresubmitCheck({
+    required FirestoreService firestoreService,
+    required int checkRunId,
+    required String buildName,
+    Transaction? transaction,
+  }) async {
+    return (await _queryPresubmitChecks(
+      firestoreService: firestoreService,
+      checkRunId: checkRunId,
+      buildName: buildName,
+      status: null,
+      transaction: transaction,
+      limit: 1,
+    )).firstOrNull;
+  }
+
   static Future<List<PresubmitCheck>> _queryPresubmitChecks({
     required FirestoreService firestoreService,
     required int checkRunId,
     String? buildName,
     TaskStatus? status,
     Transaction? transaction,
     int? attemptNumber,
+    // By default order by attempt number descending to get the latest check first.
+    Map<String, String>? orderMap = const {
+      PresubmitCheck.fieldAttemptNumber: kQueryOrderDescending,
+    },
+    int? limit,
   }) async {
     final filterMap = {
       '${PresubmitCheck.fieldCheckRunId} =': checkRunId,
       '${PresubmitCheck.fieldBuildName} =': ?buildName,
       '${PresubmitCheck.fieldStatus} =': ?status?.value,
       '${PresubmitCheck.fieldAttemptNumber} =': ?attemptNumber,
     };
-    // For tasks, therer is no reason to _not_ order this way.
-    final orderMap = {PresubmitCheck.fieldCreationTime: kQueryOrderDescending};
     final documents = await firestoreService.query(
-      collectionId,
+      PresubmitCheck.collectionId,
       filterMap,
+      limit: limit,
       orderMap: orderMap,
       transaction: transaction,
     );
@@ -285,7 +389,7 @@ final class UnifiedCheckRun {
       if (e.status == 404) {
         // An attempt to read a document not in firestore should not be retried.
         log.info(
-          '$logCrumb: $collectionId document not found for $transaction',
+          '$logCrumb: ${PresubmitCheck.collectionId} document not found for $transaction',
         );
         await firestoreService.rollback(transaction);
         return PresubmitGuardConclusion(
@@ -296,7 +400,7 @@ final class UnifiedCheckRun {
           summary: 'Internal server error',
           details:
               '''
-$collectionId document not found for stage "${guardId.stage}" for $changeCrumb. Got 404 from Firestore.
+${PresubmitCheck.collectionId} document not found for stage "${guardId.stage}" for $changeCrumb. Got 404 from Firestore.
 Error: ${e.toString()}
 $stack
 ''',
@@ -341,7 +445,7 @@ For CI stage ${guardId.stage}:
                   'to "${state.status.name}".',
       );
     } catch (e) {
-      log.info('$logCrumb: failed to update presubmit check', e);
+      log.error('$logCrumb: failed to update presubmit check', e);
       rethrow;
     }
   }
diff --git a/app_dart/lib/src/service/scheduler.dart b/app_dart/lib/src/service/scheduler.dart
@@ -382,6 +382,7 @@ class Scheduler {
             tasks: [],
             pullRequest: pullRequest,
             config: _config,
+            checkRun: lock,
           );
 
           await _runCiTestingStage(
@@ -1550,38 +1551,8 @@ $stacktrace
                 );
               }
 
-              final isFusion = slug == Config.flutterSlug;
-              final List<Target> presubmitTargets;
-              final EngineArtifacts engineArtifacts;
-              if (isFusion) {
-                // Fusion repos have presubmits split across two .ci.yaml files.
-                // /ci.yaml
-                // /engine/src/flutter/.ci.yaml
-                presubmitTargets = [
-                  ...await getPresubmitTargets(pullRequest),
-                  ...await getPresubmitTargets(
-                    pullRequest,
-                    type: CiType.fusionEngine,
-                  ),
-                ];
-                final opt = await _filesChangedOptimizer.checkPullRequest(
-                  pullRequest,
-                );
-                if (opt.shouldUsePrebuiltEngine) {
-                  engineArtifacts = EngineArtifacts.usingExistingEngine(
-                    commitSha: pullRequest.base!.sha!,
-                  );
-                } else {
-                  engineArtifacts = EngineArtifacts.builtFromSource(
-                    commitSha: pullRequest.head!.sha!,
-                  );
-                }
-              } else {
-                presubmitTargets = await getPresubmitTargets(pullRequest);
-                engineArtifacts = const EngineArtifacts.noFrameworkTests(
-                  reason: 'Not flutter/flutter',
-                );
-              }
+              final (presubmitTargets, engineArtifacts) =
+                  await _getAllTargetsForPullRequest(slug, pullRequest);
 
               final target = presubmitTargets.firstWhereOrNull(
                 (target) => checkRunEvent.checkRun!.name == target.name,
@@ -1657,6 +1628,64 @@ $stacktrace
           log.info(
             'Requested to re-run failed tests for ${checkRunEvent.checkRun!.id} check-run id',
           );
+          // The CheckRunEvent.checkRun.pullRequests array is empty for this
+          // event, so we need to find the matching pull request.
+          final slug = checkRunEvent.repository!.slug();
+          final headSha = checkRunEvent.checkRun!.headSha!;
+          final checkSuiteId = checkRunEvent.checkRun!.checkSuite!.id!;
+          final pullRequest = await _githubChecksService
+              .findMatchingPullRequest(slug, headSha, checkSuiteId);
+
+          var stage = CiStage.fusionEngineBuild;
+
+          var failedChecks = await UnifiedCheckRun.reInitializeFailedChecks(
+            firestoreService: _firestore,
+            slug: slug,
+            stage: stage,
+            pullRequest: pullRequest!,
+            checkRunId: checkRunEvent.checkRun!.id!,
+          );
+          if (failedChecks.checkNames.isEmpty) {
+            stage = CiStage.fusionTests;
+            failedChecks = await UnifiedCheckRun.reInitializeFailedChecks(
+              firestoreService: _firestore,
+              slug: slug,
+              stage: stage,
+              pullRequest: pullRequest,
+              checkRunId: checkRunEvent.checkRun!.id!,
+            );
+          }
+          if (failedChecks.checkNames.isEmpty) {
+            log.error(
+              'No failed targets found for ${checkRunEvent.checkRun!.id} check-run id',
+            );
+            return ProcessCheckRunResult.missingEntity(
+              'No failed targets found for ${checkRunEvent.checkRun!.id} check-run id',
+            );
+          }
+
+          final (targets, artifacts) = await _getAllTargetsForPullRequest(
+            slug,
+            pullRequest,
+          );
+
+          final failedTargets = targets
+              .where((target) => failedChecks.checkNames.contains(target.name))
+              .toList();
+          if (failedTargets.length != failedChecks.checkNames.length) {
+            log.error('Failed to find all failed targets in presubmit targets');
+            return const ProcessCheckRunResult.missingEntity(
+              'Failed to find all failed targets in presubmit targets',
+            );
+          }
+
+          await _luciBuildService.scheduleTryBuilds(
+            targets: failedTargets,
+            pullRequest: pullRequest,
+            engineArtifacts: artifacts,
+            checkRunGuard: failedChecks.checkRunGuard,
+            stage: stage,
+          );
         } else {
           log.warn(
             'Requested unexpected action: ${checkRunEvent.requestedAction?.identifier} for ${checkRunEvent.checkRun!.id} check-run id',
@@ -1668,6 +1697,41 @@ $stacktrace
     return const ProcessCheckRunResult.success();
   }
 
+
+  Future<(List<Target>, EngineArtifacts)> _getAllTargetsForPullRequest(
+    RepositorySlug slug,
+    PullRequest pullRequest,
+  ) async {
+    final isFusion = slug == Config.flutterSlug;
+    final List<Target> presubmitTargets;
+    final EngineArtifacts engineArtifacts;
+    if (isFusion) {
+      // Fusion repos have presubmits split across two .ci.yaml files.
+      // /ci.yaml
+      // /engine/src/flutter/.ci.yaml
+      presubmitTargets = [
+        ...await getPresubmitTargets(pullRequest),
+        ...await getPresubmitTargets(pullRequest, type: CiType.fusionEngine),
+      ];
+      final opt = await _filesChangedOptimizer.checkPullRequest(pullRequest);
+      if (opt.shouldUsePrebuiltEngine) {
+        engineArtifacts = EngineArtifacts.usingExistingEngine(
+          commitSha: pullRequest.base!.sha!,
+        );
+      } else {
+        engineArtifacts = EngineArtifacts.builtFromSource(
+          commitSha: pullRequest.head!.sha!,
+        );
+      }
+    } else {
+      presubmitTargets = await getPresubmitTargets(pullRequest);
+      engineArtifacts = const EngineArtifacts.noFrameworkTests(
+        reason: 'Not flutter/flutter',
+      );
+    }
+    return (presubmitTargets, engineArtifacts);
+  }
+
   /// Push [Commit] to BigQuery as part of the infra metrics dashboards.
   Future<void> _uploadToBigQuery(fs.Commit commit) async {
     const projectId = 'flutter-dashboard';
diff --git a/app_dart/test/service/firestore/unified_check_run_test.dart b/app_dart/test/service/firestore/unified_check_run_test.dart
diff --git a/app_dart/test/service/scheduler_test.dart b/app_dart/test/service/scheduler_test.dart
