Unified Check Run flow implementation

app_dart/lib/src/model/bbv2_extension.dart

@@ -2,21 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:buildbucket/buildbucket_pb.dart' as bbv2;
+import 'package:buildbucket/buildbucket_pb.dart' as bb;
 import 'package:cocoon_common/task_status.dart';
 
-extension StatusExtension on bbv2.Status {
-  /// Converts from a [bbv2.Status] to a [TaskStatus].
+extension StatusExtension on bb.Status {
+  /// Converts from a [bb.Status] to a [TaskStatus].
   ///
   /// An unrecognized status is disallowed.
   TaskStatus toTaskStatus() {
     return switch (this) {
-      bbv2.Status.SCHEDULED || bbv2.Status.STARTED => TaskStatus.inProgress,
-      bbv2.Status.SUCCESS => TaskStatus.succeeded,
-      bbv2.Status.CANCELED => TaskStatus.cancelled,
-      bbv2.Status.INFRA_FAILURE => TaskStatus.infraFailure,
-      bbv2.Status.FAILURE => TaskStatus.failed,
+      bb.Status.SCHEDULED || bb.Status.STARTED => TaskStatus.inProgress,
+      bb.Status.SUCCESS => TaskStatus.succeeded,
+      bb.Status.CANCELED => TaskStatus.cancelled,
+      bb.Status.INFRA_FAILURE => TaskStatus.infraFailure,
+      bb.Status.FAILURE => TaskStatus.failed,
       _ => throw StateError('Unexpected status: $this'),
     };
   }
 }
+
+extension TaskFailedExtension on bb.Status {
+  bool isTaskFailed() => switch (this) {
+    bb.Status.FAILURE || bb.Status.CANCELED || bb.Status.INFRA_FAILURE => true,
+    _ => false,
+  };
+}

app_dart/lib/src/model/common/presubmit_guard_conclusion.dart

@@ -38,15 +38,15 @@ enum PresubmitGuardConclusionResult {
 class PresubmitGuardConclusion {
   final PresubmitGuardConclusionResult result;
   final int remaining;
-  final int? checkRunId;
+  final String checkRunJson;
   final int failed;
   final String summary;
   final String details;
 
   const PresubmitGuardConclusion({
     required this.result,
     required this.remaining,
-    required this.checkRunId,
+    required this.checkRunJson,
     required this.failed,
     required this.summary,
     required this.details,
@@ -66,16 +66,22 @@ class PresubmitGuardConclusion {
       (other is PresubmitGuardConclusion &&
           other.result == result &&
           other.remaining == remaining &&
-          other.checkRunId == checkRunId &&
+          other.checkRunJson == checkRunJson &&
           other.failed == failed &&
           other.summary == summary &&
           other.details == details);
 
   @override
-  int get hashCode =>
-      Object.hashAll([result, remaining, checkRunId, failed, summary, details]);
+  int get hashCode => Object.hashAll([
+    result,
+    remaining,
+    checkRunJson,
+    failed,
+    summary,
+    details,
+  ]);
 
   @override
   String toString() =>
-      'BuildConclusion("$result", "$remaining", "$checkRunId", "$failed", "$summary", "$details")';
+      'BuildConclusion("$result", "$remaining", "$failed", "$summary", "$details", "$checkRunJson")';
 }

app_dart/lib/src/model/firestore/presubmit_guard.dart

@@ -185,9 +185,15 @@ final class PresubmitGuard extends AppDocument<PresubmitGuard> {
   CheckRun get checkRun {
     final jsonData =
         jsonDecode(fields[fieldCheckRun]!.stringValue!) as Map<String, Object?>;
+    // Workaround for https://github.com/SpinlockLabs/github.dart/issues/412
+    if (jsonData['conclusion'] == 'null') {
+      jsonData.remove('conclusion');
+    }
     return CheckRun.fromJson(jsonData);
   }
 
+  String get checkRunJson => fields[fieldCheckRun]!.stringValue!;
+
   /// The repository that this stage is recorded for.
   RepositorySlug get slug {
     // Read it from the document name.

app_dart/lib/src/request_handlers/presubmit_luci_subscription.dart

@@ -9,6 +9,7 @@ import 'package:buildbucket/buildbucket_pb.dart' as bbv2;
 import 'package:cocoon_server/logging.dart';
 import 'package:github/github.dart';
 
+import '../model/bbv2_extension.dart';
 import '../model/ci_yaml/ci_yaml.dart';
 import '../model/ci_yaml/target.dart';
 import '../model/commit_ref.dart';
@@ -102,65 +103,70 @@ final class PresubmitLuciSubscription extends SubscriptionHandler {
 
     final userData = PresubmitUserData.fromBytes(pubSubCallBack.userData);
     var rescheduled = false;
-    if (_githubChecksService.taskFailed(build.status)) {
-      final currentAttempt = _nextAttempt(tagSet);
+    if (build.status.isTaskFailed()) {
+      // if failed summary stored in github check run and unified check run.
+      build.summaryMarkdown = (await _luciBuildService.getBuildById(
+        build.id,
+        buildMask: bbv2.BuildMask(
+          // Need to use allFields as there is a bug with fieldMask and summaryMarkdown.
+          allFields: true,
+        ),
+      )).summaryMarkdown;
       final maxAttempt = await _getMaxAttempt(
         userData.commit,
         builderName,
         tagSet,
       );
-      if (currentAttempt < maxAttempt) {
+      if (tagSet.currentAttempt < maxAttempt) {
         rescheduled = true;
         log.info('Rerunning failed task: $builderName');
         await _luciBuildService.reschedulePresubmitBuild(
           builderName: builderName,
           build: build,
-          nextAttempt: currentAttempt + 1,
+          nextAttempt: tagSet.currentAttempt + 1,
           userData: userData,
         );
       }
     }
-    await _githubChecksService.updateCheckStatus(
-      checkRunId: userData.checkRunId,
-      build: build,
-      luciBuildService: _luciBuildService,
-      slug: userData.commit.slug,
-      rescheduled: rescheduled,
-    );
+    if (userData.checkRunId != null) {
+      await _githubChecksService.updateCheckStatus(
+        checkRunId: userData.checkRunId!,
+        build: build,
+        luciBuildService: _luciBuildService,
+        slug: userData.commit.slug,
+        rescheduled: rescheduled,
+      );
 
-    if (!rescheduled && config.flags.closeMqGuardAfterPresubmit) {
-      // Process to the check-run status in the merge queue document during
-      // the LUCI callback.
-      final conclusion = _githubChecksService.conclusionForResult(build.status);
-      await _scheduler.processCheckRunCompleted(
-        cocoon_checks.CheckRun(
-          id: userData.checkRunId,
-          name: builderName,
-          headSha: userData.commit.sha,
-          conclusion: '$conclusion',
-          checkSuite: CheckSuite(
-            id: userData.checkSuiteId,
-            headBranch: userData.commit.branch,
+      if (!rescheduled && config.flags.closeMqGuardAfterPresubmit) {
+        // Process to the check-run status in the merge queue document during
+        // the LUCI callback.
+        final conclusion = _githubChecksService.conclusionForResult(
+          build.status,
+        );
+        await _scheduler.processCheckRunCompleted(
+          cocoon_checks.CheckRun(
+            id: userData.checkRunId,
+            name: builderName,
             headSha: userData.commit.sha,
-            conclusion: conclusion,
-            pullRequests: [],
+            conclusion: '$conclusion',
+            checkSuite: CheckSuite(
+              id: userData.checkSuiteId,
+              headBranch: userData.commit.branch,
+              headSha: userData.commit.sha,
+              conclusion: conclusion,
+              pullRequests: [],
+            ),
           ),
-        ),
-        userData.commit.slug,
-      );
+          userData.commit.slug,
+        );
+      }
+    } else if (!rescheduled) {
+      await _scheduler.processUnifiedCheckRunCompleted(build, userData);
     }
 
     return Response.emptyOk;
   }
 
-  /// Returns the current reschedule attempt.
-  ///
-  /// It returns 1 if this is the first run.
-  static int _nextAttempt(BuildTags buildTags) {
-    final attempt = buildTags.getTagOfType<CurrentAttemptBuildTag>();
-    return attempt?.attemptNumber ?? 1;
-  }
-
   Future<int> _getMaxAttempt(
     CommitRef commit,
     String builderName,

app_dart/lib/src/service/firestore/unified_check_run.dart

@@ -249,7 +249,7 @@ final class UnifiedCheckRun {
         return PresubmitGuardConclusion(
           result: PresubmitGuardConclusionResult.missing,
           remaining: presubmitGuard.remainingBuilds ?? -1,
-          checkRunId: guardId.checkRunId,
+          checkRunJson: presubmitGuard.checkRunJson,
           failed: presubmitGuard.failedBuilds ?? -1,
           summary:
               'Check run "${state.buildName}" not present in ${guardId.stage} CI stage',
@@ -336,7 +336,7 @@ final class UnifiedCheckRun {
         return PresubmitGuardConclusion(
           result: PresubmitGuardConclusionResult.internalError,
           remaining: -1,
-          checkRunId: null,
+          checkRunJson: '',
           failed: failed,
           summary: 'Internal server error',
           details:
@@ -371,7 +371,7 @@ $stack
             ? PresubmitGuardConclusionResult.ok
             : PresubmitGuardConclusionResult.internalError,
         remaining: remaining,
-        checkRunId: guardId.checkRunId,
+        checkRunJson: presubmitGuard.checkRunJson,
         failed: failed,
         summary: valid
             ? 'Successfully updated presubmit guard status'

app_dart/lib/src/service/github_checks_service.dart

@@ -7,6 +7,7 @@ import 'package:cocoon_server/logging.dart';
 import 'package:github/github.dart' as github;
 
 import '../foundation/github_checks_util.dart';
+import '../model/bbv2_extension.dart';
 import 'config.dart';
 import 'luci_build_service.dart';
 
@@ -72,7 +73,7 @@ class GithubChecksService {
     final url = 'https://cr-buildbucket.appspot.com/build/${build.id}';
     github.CheckRunOutput? output;
     // If status has completed with failure then provide more details.
-    if (taskFailed(build.status)) {
+    if (build.status.isTaskFailed()) {
       log.info(
         'failed presubmit task, ${build.id} has failed, status = ${build.status.toString()}',
       );
@@ -114,14 +115,6 @@ class GithubChecksService {
     return true;
   }
 
-  /// Check if task has completed with failure.
-  bool taskFailed(bbv2.Status status) {
-    final checkRunStatus = statusForResult(status);
-    final conclusion = conclusionForResult(status);
-    return (checkRunStatus == github.CheckRunStatus.completed) &&
-        failedStatesSet.contains(conclusion);
-  }
-
   /// Appends triage wiki page to `summaryMarkdown` from LUCI build so that people can easily
   /// reference from github check run page.
   String getGithubSummary(String? summary) {