Implement the execution of flutter shard tests in engine prs.

This CL is adding the following functionality:

* prod builds using the experimental realm will now upload the artifacts
  to a non production gcs bucket.
* try builds will be uploading artifacts to a namespaced path using the
  buildbucket id.
* Minimum changes to tester.py recipe to implement the paths expected
  for non monorepo builds.
* Changes to shard util to always pass the parent commit and buildbucket
  id as properties of subbuilds.

Bug: https://github.com/flutter/flutter/issues/146599
Change-Id: Ib92383ace36034dc8b2c217c861d77b99ed08adf
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/57140
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/.style.yapf b/.style.yapf
index a4860f7..c27ecfc 100644
--- a/.style.yapf
+++ b/.style.yapf
@@ -8,5 +8,5 @@
 # dedent_closing_brackets is required by coalesce_brackets
 dedent_closing_brackets = true
 coalesce_brackets = true
-each_dict_entry_on_separate_line = false
+each_dict_entry_on_separate_line = true
 column_limit: 80
diff --git a/recipe_modules/archives/__init__.py b/recipe_modules/archives/__init__.py
index fd7fd95..6c9fef5 100644
--- a/recipe_modules/archives/__init__.py
+++ b/recipe_modules/archives/__init__.py
@@ -4,6 +4,7 @@
 
 DEPS = [
     'depot_tools/gsutil',
+    'flutter/flutter_bcid',
     'flutter/monorepo',
     'flutter/repo_util',
     'recipe_engine/buildbucket',
diff --git a/recipe_modules/archives/api.py b/recipe_modules/archives/api.py
index 36e16cc..5327157 100644
--- a/recipe_modules/archives/api.py
+++ b/recipe_modules/archives/api.py
@@ -38,25 +38,45 @@
 
 # Bucket + initial prefix for artifact destination.
 LUCI_TO_GCS_PREFIX = {
-    'flutter':
-        'flutter_infra_release', MONOREPO:
-            'flutter_archives_v2/monorepo/flutter_infra_release',
-    MONOREPO_TRY_BUCKET:
-        'flutter_archives_v2/monorepo_try/flutter_infra_release', 'prod':
-            'flutter_infra_release', 'staging':
-                'flutter_archives_v2/flutter_infra_release', 'try':
-                    'flutter_archives_v2/flutter_infra_release', 'try.shadow':
-                        'flutter_archives_v2/flutter_infra_release',
-    'prod.shadow':
-        'flutter_archives_v2/flutter_infra_release'
+    'flutter_EXPERIMENTAL': ('flutter_infra_release', ''),
+    'flutter_PRODUCTION': ('flutter_infra_release', ''),
+    '%s_EXPERIMENTAL' % MONOREPO:
+        ('flutter_archives_v2/monorepo', 'flutter_infra_release'),
+    '%s_PRODUCTION' % MONOREPO:
+        ('flutter_archives_v2/monorepo', 'flutter_infra_release'),
+    '%s_EXPERIMENTAL' % MONOREPO_TRY_BUCKET:
+        ('flutter_archives_v2/monorepo_try', 'flutter_infra_release'),
+    '%s_PRODUCTION' % MONOREPO_TRY_BUCKET:
+        ('flutter_archives_v2/monorepo_try', 'flutter_infra_release'),
+    'prod_PRODUCTION': ('flutter_infra_release', ''),
+    'prod_EXPERIMENTAL': ('flutter_archives_v2', 'flutter_infra_release'),
+    'staging_PRODUCTION': ('flutter_archives_v2', 'flutter_infra_release'),
+    'staging_EXPERIMENTAL': ('flutter_archives_v2', 'flutter_infra_release'),
+    'try_PRODUCTION': ('flutter_archives_v2', 'flutter_infra_release'),
+    'try_EXPERIMENTAL': ('flutter_archives_v2', 'flutter_infra_release'),
+    'try.shadow_PRODUCTION': ('flutter_archives_v2', 'flutter_infra_release'),
+    'try.shadow_EXPERIMENTAL': ('flutter_archives_v2', 'flutter_infra_release'),
+    'prod.shadow_PRODUCTION': ('flutter_archives_v2', 'flutter_infra_release'),
+    'prod.shadow_EXPERIMENTAL':
+        ('flutter_archives_v2', 'flutter_infra_release')
 }
 
 # Bucket + initial prefix for artifact destination.
 LUCI_TO_ANDROID_GCS_PREFIX = {
-    'flutter': '', MONOREPO: 'flutter_archives_v2/monorepo',
-    MONOREPO_TRY_BUCKET: 'flutter_archives_v2/monorepo_try', 'prod': '',
-    'staging': 'flutter_archives_v2', 'try': 'flutter_archives_v2',
-    'try.shadow': 'flutter_archives_v2'
+    'flutter_EXPERIMENTAL': '',
+    'flutter_PRODUCTION': '',
+    '%s_EXPERIMENTAL' % MONOREPO: 'flutter_archives_v2/monorepo',
+    '%s_PRODUCTION' % MONOREPO: 'flutter_archives_v2/monorepo',
+    '%s_EXPERIMENTAL' % MONOREPO_TRY_BUCKET: 'flutter_archives_v2/monorepo_try',
+    '%s_PRODUCTION' % MONOREPO_TRY_BUCKET: 'flutter_archives_v2/monorepo_try',
+    'prod_EXPERIMENTAL': 'flutter_archives_v2',
+    'prod_PRODUCTION': '',
+    'staging_EXPERIMENTAL': 'flutter_archives_v2',
+    'staging_PRODUCTION': 'flutter_archives_v2',
+    'try_EXPERIMENTAL': 'flutter_archives_v2',
+    'try_PRODUCTION': 'flutter_archives_v2',
+    'try.shadow_EXPERIMENTAL': 'flutter_archives_v2',
+    'try.shadow_PRODUCTION': 'flutter_archives_v2'
 }
 
 # Subpath for realms. A realm is used to separate file destinations
@@ -163,16 +183,13 @@
       generated artifacts.
     """
     results = []
-    # Artifacts bucket is calculated using the LUCI bucket but we also use the realm to upload
-    # artifacts to the same bucket but different path when the build configurations use an experimental
-    # realm. Defaults to experimental.
-    artifact_realm = REALM_TO_PATH.get(
-        archive_config.get('realm', ''), 'experimental'
-    )
-    # Calculate prefix and commit.
+    build_id = ''
+    realm = archive_config.get('realm', 'experimental').upper()
+    # Weather to include build_id as part of the namespace or not.
+    include_build_id = True
     file_list = self._full_path_list(checkout, archive_config)
     if self.m.monorepo.is_monorepo_try_build:
-      commit = self.m.monorepo.try_build_identifier
+      commit = self.m.monorepo.build_identifier
       bucket = MONOREPO_TRY_BUCKET
     elif self.m.monorepo.is_monorepo_ci_build:
       commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
@@ -180,7 +197,12 @@
     else:
       commit = self.m.repo_util.get_commit(checkout.join('flutter'))
       bucket = self.m.buildbucket.build.builder.bucket
-
+      if self.m.flutter_bcid.is_official_build():
+        include_build_id = False
+      elif self.m.flutter_bcid.is_prod_build() and realm == 'PRODUCTION':
+        include_build_id = False
+    build_id = self.m.monorepo.build_identifier if include_build_id else ''
+    bucket_plus_realm = '_'.join(filter(None, (bucket, realm)))
     for include_path in file_list:
       is_android_artifact = ANDROID_ARTIFACTS_BUCKET in include_path
       dir_part = self.m.path.dirname(include_path)
@@ -198,22 +220,19 @@
         # Replace ANDROID_ARTIFACTS_BUCKET to include the realm.
         old_location = '/'.join([ANDROID_ARTIFACTS_BUCKET, 'io', 'flutter'])
         new_location = '/'.join(
-            filter(
-                bool,
-                [ANDROID_ARTIFACTS_BUCKET, 'io', 'flutter', artifact_realm]
-            )
+            filter(bool, [ANDROID_ARTIFACTS_BUCKET, 'io', 'flutter'])
         )
         artifact_path = artifact_path.replace(old_location, new_location)
-        bucket_and_prefix = LUCI_TO_ANDROID_GCS_PREFIX.get(bucket)
+        bucket_and_prefix = LUCI_TO_ANDROID_GCS_PREFIX.get(bucket_plus_realm)
         artifact_path = '/'.join(
-            filter(bool, [bucket_and_prefix, artifact_path])
+            filter(bool, [bucket_and_prefix, build_id, artifact_path])
         )
       else:
-        bucket_and_prefix = LUCI_TO_GCS_PREFIX.get(bucket)
+        gcs_bucket, bucket_postfix = LUCI_TO_GCS_PREFIX.get(bucket_plus_realm)
         artifact_path = '/'.join(
             filter(
                 bool, [
-                    bucket_and_prefix, 'flutter', artifact_realm, commit,
+                    gcs_bucket, build_id, bucket_postfix, 'flutter', commit,
                     rel_path, base_name
                 ]
             )
@@ -235,10 +254,11 @@
       generated artifacts.
     """
     results = []
+    build_id = ''
 
     # Calculate prefix and commit.
     if self.m.monorepo.is_monorepo_try_build:
-      commit = self.m.monorepo.try_build_identifier
+      commit = self.m.monorepo.build_identifier
       bucket = MONOREPO_TRY_BUCKET
     elif self.m.monorepo.is_monorepo_ci_build:
       commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
@@ -246,20 +266,22 @@
     else:
       commit = self.m.repo_util.get_commit(checkout.join('flutter'))
       bucket = self.m.buildbucket.build.builder.bucket
-    bucket_and_prefix = LUCI_TO_GCS_PREFIX.get(bucket)
 
     for archive in archives:
-      # Artifacts bucket is calculated using the LUCI bucket but we also use the realm to upload
-      # artifacts to the same bucket but different path when the build configurations use an
-      # experimental realm. Defaults to experimental.
-      artifact_realm = REALM_TO_PATH.get(
-          archive.get('realm', ''), 'experimental'
-      )
+      realm = archive.get('realm', 'experimental').upper()
+      bucket_plus_realm = '_'.join(filter(None, (bucket, realm)))
+      include_build_id = True
+      if self.m.flutter_bcid.is_official_build():
+        include_build_id = False
+      if self.m.flutter_bcid.is_prod_build() and realm == 'PRODUCTION':
+        include_build_id = False
+      build_id = self.m.monorepo.build_identifier if include_build_id else ''
+      gcs_bucket, bucket_postfix = LUCI_TO_GCS_PREFIX.get(bucket_plus_realm)
       source = checkout.join(archive.get('source'))
       artifact_path = '/'.join(
           filter(
               bool, [
-                  bucket_and_prefix, 'flutter', artifact_realm, commit,
+                  gcs_bucket, build_id, bucket_postfix, 'flutter', commit,
                   archive.get('destination')
               ]
           )
diff --git a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json
new file mode 100644
index 0000000..be1d509
--- /dev/null
+++ b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json
@@ -0,0 +1,65 @@
+[
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "listdir",
+      "[START_DIR]/out/android_profile/zip_archives/download.flutter.io",
+      "--recursive"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:98765",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Expand directory",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@listdir@[START_DIR]/out/android_profile/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+      "@@@STEP_LOG_LINE@listdir@[START_DIR]/out/android_profile/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+      "@@@STEP_LOG_END@listdir@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:98765",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json
index 5b0bf0d..2ff36ea 100644
--- a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json
+++ b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/engine_v2_gcs_paths.py b/recipe_modules/archives/examples/engine_v2_gcs_paths.py
index 2be6b91..33400a6 100644
--- a/recipe_modules/archives/examples/engine_v2_gcs_paths.py
+++ b/recipe_modules/archives/examples/engine_v2_gcs_paths.py
@@ -19,12 +19,16 @@
 
 def RunSteps(api):
   checkout = api.path['start_dir']
-  config = {
+  config = api.properties.get('config')
+  config_prod_realm = {
       "name":
-          "android_profile", "type":
-              "gcs", "base_path":
-                  "out/android_profile/zip_archives/", "realm":
-                      "production",
+          "android_profile",
+      "type":
+          "gcs",
+      "base_path":
+          "out/android_profile/zip_archives/",
+      "realm":
+          "production",
       "include_paths": [
           "out/android_profile/zip_archives/artifact1.zip",
           "out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
@@ -34,7 +38,28 @@
           "out/android_profile/zip_archives/sky_engine.zip"
       ]
   }
-  results = api.archives.engine_v2_gcs_paths(checkout, config)
+  config_default_realm = {
+      "name":
+          "android_profile",
+      "type":
+          "gcs",
+      "base_path":
+          "out/android_profile/zip_archives/",
+      "include_paths": [
+          "out/android_profile/zip_archives/artifact1.zip",
+          "out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
+          "out/android_profile/zip_archives/android-arm-profile/linux-x64.zip",
+          "out/android_profile/zip_archives/android-arm-profile/symbols.zip",
+          "out/android_profile/zip_archives/download.flutter.io",
+          "out/android_profile/zip_archives/sky_engine.zip"
+      ]
+  }
+  archive_configs = {
+      "try": config_prod_realm,
+      "prod": config_prod_realm,
+      "prod_default_realm": config_default_realm
+  }
+  results = api.archives.engine_v2_gcs_paths(checkout, archive_configs[config])
   expected_prod_results = [
       ArchivePaths(
           local=str(
@@ -97,7 +122,7 @@
               api.path['start_dir']
               .join('out/android_profile/zip_archives/artifact1.zip')
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/artifact1.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/artifact1.zip'
       ),
       ArchivePaths(
           local=str(
@@ -105,7 +130,7 @@
                   'out/android_profile/zip_archives/android-arm-profile/artifacts.zip'
               )
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip'
       ),
       ArchivePaths(
           local=str(
@@ -113,7 +138,7 @@
                   'out/android_profile/zip_archives/android-arm-profile/linux-x64.zip'
               )
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip'
       ),
       ArchivePaths(
           local=str(
@@ -121,7 +146,7 @@
                   'out/android_profile/zip_archives/android-arm-profile/symbols.zip'
               )
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip'
       ),
       ArchivePaths(
           local=str(
@@ -129,7 +154,7 @@
                   'out/android_profile/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar'
               )
           ),
-          remote='gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar'
+          remote='gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar'
       ),
       ArchivePaths(
           local=str(
@@ -137,19 +162,20 @@
                   'out/android_profile/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
               )
           ),
-          remote='gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+          remote='gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir']
               .join('out/android_profile/zip_archives/sky_engine.zip')
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/sky_engine.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/sky_engine.zip'
       )
   ]
-  config = api.properties.get('config')
   expected_results = {
-      'prod': expected_prod_results, 'try': expected_try_results
+      'prod': expected_prod_results,
+      'try': expected_try_results,
+      'prod_default_realm': expected_try_results
   }
   api.assertions.assertListEqual(expected_results[config], results)
 
@@ -170,12 +196,28 @@
       )
   )
   yield api.test(
+      'prod_default_realm',
+      api.buildbucket.ci_build(
+          project='flutter',
+          bucket='prod',
+          git_repo='https://flutter.googlesource.com/mirrors/engine',
+          git_ref='refs/heads/main',
+          build_id=98765
+      ), api.properties(config='prod_default_realm'),
+      api.step_data(
+          'git rev-parse',
+          stdout=api.raw_io
+          .output_text('12345abcde12345abcde12345abcde12345abcde\n')
+      )
+  )
+  yield api.test(
       'try',
       api.buildbucket.ci_build(
           project='flutter',
           bucket='try',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ), api.properties(config='try'),
       api.step_data(
           'git rev-parse',
diff --git a/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json
index 69222ac..7570445 100644
--- a/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json
@@ -62,7 +62,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -77,7 +77,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +88,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -145,7 +145,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -161,7 +161,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_ci.json b/recipe_modules/archives/examples/full.expected/monorepo_ci.json
index bfe9d29..ae890b0 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_ci.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_ci.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,13 +132,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json b/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json
index 17b0898..ae890b0 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,13 +132,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_try_experimental_realm.json b/recipe_modules/archives/examples/full.expected/monorepo_try_experimental_realm.json
index d8625c9..186d5ac 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_try_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_try_experimental_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -31,6 +31,20 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -40,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -49,13 +63,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile"
+    "name": "Ensure monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile"
   },
   {
     "cmd": [
@@ -66,7 +80,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -75,7 +89,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -103,13 +117,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -123,7 +137,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -133,13 +147,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_try_production_realm.json b/recipe_modules/archives/examples/full.expected/monorepo_try_production_realm.json
index 843d2ed..186d5ac 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_try_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_try_production_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -31,6 +31,20 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -40,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -49,13 +63,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile"
+    "name": "Ensure monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile"
   },
   {
     "cmd": [
@@ -66,7 +80,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -75,7 +89,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -103,13 +117,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -123,7 +137,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -133,13 +147,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
index 5bb5de7..746977c 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -116,7 +123,7 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_1/*",
-      "gs://flutter_infra_release/"
+      "gs://flutter_archives_v2/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -125,15 +132,15 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
   },
   {
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json
index 5875565..3e18220 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -71,7 +71,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -97,7 +97,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,7 +125,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -155,7 +155,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
index 47c8b53..ddda29f 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,13 +132,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
index 11e180e..ddda29f 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,13 +132,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
index b866f0e..5c4f8fa 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,13 +132,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
index 9b67ee6..5c4f8fa 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,6 +53,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -62,7 +69,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -71,13 +78,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+    "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
   },
   {
     "cmd": [
@@ -88,7 +95,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+      "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
     ],
     "infra_step": true,
     "luci_context": {
@@ -97,7 +104,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,13 +132,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -145,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+      "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
       "[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
     ],
     "infra_step": true,
@@ -155,13 +162,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
   },
   {
     "name": "$result"
diff --git a/recipe_modules/archives/examples/full.py b/recipe_modules/archives/examples/full.py
index 2781ba1..82e472a 100644
--- a/recipe_modules/archives/examples/full.py
+++ b/recipe_modules/archives/examples/full.py
@@ -31,10 +31,13 @@
 def GenTests(api):
   archive_config = {
       "name":
-          "android_profile", "type":
-              "gcs", "realm":
-                  "production", "base_path":
-                      "out/android_profile/zip_archives/",
+          "android_profile",
+      "type":
+          "gcs",
+      "realm":
+          "production",
+      "base_path":
+          "out/android_profile/zip_archives/",
       "include_paths": [
           "out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
           "out/android_profile/zip_archives/android-arm-profile/linux-x64.zip",
@@ -45,11 +48,11 @@
 
   # Try LUCI pool with "production" realm in build configuration file.
   try_pool_production_realm = [
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+      'gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
+      'gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
+      'gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
+      'gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
+      'gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
   ]
   yield api.test(
       'try_pool_production_realm',
@@ -61,7 +64,8 @@
           project='flutter',
           bucket='try',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -71,13 +75,7 @@
   )
 
   # Try LUCI pool with "experimental" realm in build configuration file.
-  try_pool_experimental_realm = [
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
-  ]
+  try_pool_experimental_realm = try_pool_production_realm
   try_pool_experimental_realm_config = copy.deepcopy(archive_config)
   try_pool_experimental_realm_config['realm'] = 'experimental'
   yield api.test(
@@ -90,7 +88,8 @@
           project='flutter',
           bucket='try',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -117,7 +116,8 @@
           project='flutter',
           bucket='prod',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -127,13 +127,7 @@
   )
 
   # Prod LUCI pool with "experimental" realm in build configuration file.
-  prod_pool_experimental_realm = [
-      'gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
-  ]
+  prod_pool_experimental_realm = try_pool_production_realm
   prod_pool_experimental_realm_config = copy.deepcopy(archive_config)
   prod_pool_experimental_realm_config['realm'] = 'experimental'
   yield api.test(
@@ -146,7 +140,8 @@
           project='flutter',
           bucket='prod',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -156,13 +151,7 @@
   )
 
   # Flutter LUCI pool with "production" realm in build configuration file.
-  flutter_pool_production_realm = [
-      'gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
-  ]
+  flutter_pool_production_realm = prod_pool_production_realm
   yield api.test(
       'flutter_pool_production_realm',
       api.properties(
@@ -183,13 +172,7 @@
   )
 
   # Flutter LUCI pool with "experimental" realm in build configuration file.
-  flutter_pool_production_realm = [
-      'gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
-  ]
+  flutter_pool_production_realm = prod_pool_production_realm
   flutter_pool_experimental_realm_config = copy.deepcopy(archive_config)
   flutter_pool_experimental_realm_config['realm'] = 'experimental'
   yield api.test(
@@ -212,13 +195,7 @@
   )
 
   # Staging LUCI pool with "production" realm in build configuration file.
-  staging_pool_production_realm = [
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
-  ]
+  staging_pool_production_realm = try_pool_production_realm
   yield api.test(
       'staging_pool_production_realm',
       api.properties(
@@ -229,7 +206,8 @@
           project='flutter',
           bucket='staging',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -239,13 +217,7 @@
   )
 
   # Staging LUCI pool with "production" realm in build configuration file.
-  staging_pool_production_realm = [
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
-  ]
+  staging_pool_production_realm = try_pool_production_realm
   staging_pool_experimental_realm_config = copy.deepcopy(archive_config)
   staging_pool_experimental_realm_config['realm'] = 'experimental'
   yield api.test(
@@ -258,7 +230,8 @@
           project='flutter',
           bucket='staging',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -269,11 +242,11 @@
 
   # Monorepo ci  with "production" realm in build configuration file.
   monorepo_production_realm = [
-      'gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/monorepo/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/monorepo/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+      'gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
+      'gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
+      'gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
+      'gs://flutter_archives_v2/monorepo/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
+      'gs://flutter_archives_v2/monorepo/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
   ]
   yield api.test(
       'monorepo_ci', api.monorepo.ci_build(),
@@ -292,11 +265,11 @@
   monorepo_experimental_realm_config = copy.deepcopy(archive_config)
   monorepo_experimental_realm_config['realm'] = 'experimental'
   monorepo_experimental_realm = [
-      'gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/monorepo/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/monorepo/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+      'gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
+      'gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
+      'gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
+      'gs://flutter_archives_v2/monorepo/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
+      'gs://flutter_archives_v2/monorepo/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
   ]
   yield api.test(
       'monorepo_ci_experimental_realm', api.monorepo.ci_build(),
@@ -313,29 +286,28 @@
 
   # Monorepo try with "production" realm in build configuration file.
   monorepo_try_production_realm = [
-      'gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/8112381/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/monorepo_try/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/monorepo_try/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+      'gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip',
+      'gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/linux-x64.zip',
+      'gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/symbols.zip',
+      'gs://flutter_archives_v2/monorepo_try/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
+      'gs://flutter_archives_v2/monorepo_try/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
   ]
   yield api.test(
       'monorepo_try_production_realm',
       api.properties(
           config=archive_config,
           expected_destinations=monorepo_try_production_realm,
-          try_build_identifier='8112381',
       ),
-      api.monorepo.try_build(),
+      api.monorepo.try_build(build_id=123),
   )
 
   # Monorepo try with "experimental" realm in build configuration file.
   monorepo_try_experimental_realm = [
-      'gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile/artifacts.zip',
-      'gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile/linux-x64.zip',
-      'gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8112381/android-arm-profile/symbols.zip',
-      'gs://flutter_archives_v2/monorepo_try/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
-      'gs://flutter_archives_v2/monorepo_try/download.flutter.io/io/flutter/experimental/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+      'gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/artifacts.zip',
+      'gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/linux-x64.zip',
+      'gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/android-arm-profile/symbols.zip',
+      'gs://flutter_archives_v2/monorepo_try/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
+      'gs://flutter_archives_v2/monorepo_try/123/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
   ]
   monorepo_experimental_realm_config = copy.deepcopy(archive_config)
   monorepo_experimental_realm_config['realm'] = 'experimental'
@@ -344,7 +316,6 @@
       api.properties(
           config=monorepo_experimental_realm_config,
           expected_destinations=monorepo_try_experimental_realm,
-          try_build_identifier='8112381',
       ),
-      api.monorepo.try_build(),
+      api.monorepo.try_build(build_id=123),
   )
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json b/recipe_modules/archives/examples/global_generator_paths.expected/flutter.json
similarity index 81%
rename from recipe_modules/archives/examples/global_generator_paths.expected/basic.json
rename to recipe_modules/archives/examples/global_generator_paths.expected/flutter.json
index 0ea5a52..32eeb9b 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/flutter.json
@@ -9,11 +9,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "flutter:prod"
+        "name": "dart-internal:flutter"
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_ci.json b/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_ci.json
index b0e04e1..ad05583 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_ci.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_ci.json
@@ -13,7 +13,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -22,6 +22,27 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (3)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_try.json b/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_try.json
index 1da51b4..0dcc5ba 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_try.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_try.json
@@ -3,7 +3,28 @@
     "cmd": [],
     "name": "get buildbucket id",
     "~followup_annotations": [
-      "@@@STEP_TEXT@8945511751514863184@@@"
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (3)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (4)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
     ]
   },
   {
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json b/recipe_modules/archives/examples/global_generator_paths.expected/prod.json
similarity index 71%
copy from recipe_modules/archives/examples/global_generator_paths.expected/basic.json
copy to recipe_modules/archives/examples/global_generator_paths.expected/prod.json
index 0ea5a52..7a87e68 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/prod.json
@@ -13,7 +13,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -22,6 +22,13 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/try.json b/recipe_modules/archives/examples/global_generator_paths.expected/try.json
index 74fb50b..8240515 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/try.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/try.json
@@ -13,7 +13,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:98765",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -22,6 +22,27 @@
     "name": "git rev-parse"
   },
   {
+    "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (3)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@98765@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/global_generator_paths.py b/recipe_modules/archives/examples/global_generator_paths.py
index 1e0b7e3..aa68d0e 100644
--- a/recipe_modules/archives/examples/global_generator_paths.py
+++ b/recipe_modules/archives/examples/global_generator_paths.py
@@ -20,10 +20,13 @@
 def RunSteps(api):
   checkout = api.path['start_dir'].join('src')
   archives = [{
-      "source": "out/debug/artifacts.zip", "destination": "ios/artifacts.zip"
+      "source": "out/debug/artifacts.zip",
+      "destination": "ios/artifacts.zip",
+      "realm": "production"
   }, {
       "source": "out/release-nobitcode/Flutter.dSYM.zip",
-      "destination": "ios-release-nobitcode/Flutter.dSYM.zip"
+      "destination": "ios-release-nobitcode/Flutter.dSYM.zip",
+      "realm": "production"
   }, {
       "source": "out/release/Flutter.dSYM.zip",
       "destination": "ios-release/Flutter.dSYM.zip"
@@ -31,82 +34,104 @@
   expected_results = [
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
-          remote='gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir']
               .join('src/out/release-nobitcode/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+      )
+  ]
+  expected_results_flutter = [
+      ArchivePaths(
+          local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
+          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+      ),
+      ArchivePaths(
+          local=str(
+              api.path['start_dir']
+              .join('src/out/release-nobitcode/Flutter.dSYM.zip')
+          ),
+          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+      ),
+      ArchivePaths(
+          local=str(
+              api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
+          ),
+          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
       )
   ]
   expected_monorepo_results = [
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
-          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+          remote='gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir']
               .join('src/out/release-nobitcode/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
       )
   ]
   expected_monorepo_try_results = [
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
-          remote='gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8945511751514863184/ios/artifacts.zip'
+          remote='gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/ios/artifacts.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir']
               .join('src/out/release-nobitcode/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8945511751514863184/ios-release-nobitcode/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/ios-release-nobitcode/Flutter.dSYM.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/experimental/8945511751514863184/ios-release/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/monorepo_try/123/flutter_infra_release/flutter/123/ios-release/Flutter.dSYM.zip'
       )
   ]
   expected_try_results = [
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir']
               .join('src/out/release-nobitcode/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
       ),
       ArchivePaths(
           local=str(
               api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
           ),
-          remote='gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
       )
   ]
   env_to_results = {
-      'production': expected_results, 'monorepo': expected_monorepo_results,
-      'monorepo_try': expected_monorepo_try_results, 'try': expected_try_results
+      'production': expected_results,
+      'monorepo': expected_monorepo_results,
+      'monorepo_try': expected_monorepo_try_results,
+      'try': expected_try_results,
+      'flutter': expected_results_flutter
   }
   config = api.properties.get('config')
   results = api.archives.global_generator_paths(checkout, archives)
@@ -115,12 +140,28 @@
 
 def GenTests(api):
   yield api.test(
-      'basic', api.properties(config='production'),
+      'prod', api.properties(config='production'),
       api.buildbucket.ci_build(
           project='flutter',
           bucket='prod',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
+      ),
+      api.step_data(
+          'git rev-parse',
+          stdout=api.raw_io
+          .output_text('12345abcde12345abcde12345abcde12345abcde\n')
+      )
+  )
+  yield api.test(
+      'flutter', api.properties(config='flutter'),
+      api.buildbucket.ci_build(
+          project='dart-internal',
+          bucket='flutter',
+          git_repo='https://flutter.googlesource.com/mirrors/engine',
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
@@ -136,7 +177,7 @@
   yield api.test(
       'monorepo_try',
       api.properties(config='monorepo_try'),
-      api.monorepo.try_build(),
+      api.monorepo.try_build(build_id=123),
   )
   yield api.test(
       'try', api.properties(config='try'),
@@ -144,7 +185,8 @@
           project='flutter',
           bucket='try',
           git_repo='https://flutter.googlesource.com/mirrors/engine',
-          git_ref='refs/heads/main'
+          git_ref='refs/heads/main',
+          build_id=98765
       ),
       api.step_data(
           'git rev-parse',
diff --git a/recipe_modules/flutter_bcid/api.py b/recipe_modules/flutter_bcid/api.py
index ef8413a..8a02a06 100644
--- a/recipe_modules/flutter_bcid/api.py
+++ b/recipe_modules/flutter_bcid/api.py
@@ -32,6 +32,10 @@
     bucket = self.m.buildbucket.build.builder.bucket
     return bucket in ('prod', 'prod.shadow')
 
+  def is_try_build(self):
+    bucket = self.m.buildbucket.build.builder.bucket
+    return bucket in ('try', 'try.shadow')
+
   def report_stage(self, stage):
     if self.is_official_build():
       self.m.bcid_reporter.report_stage(stage)
diff --git a/recipe_modules/flutter_bcid/examples/full.py b/recipe_modules/flutter_bcid/examples/full.py
index 03c22a8..08b22cb 100644
--- a/recipe_modules/flutter_bcid/examples/full.py
+++ b/recipe_modules/flutter_bcid/examples/full.py
@@ -17,6 +17,7 @@
   )
   api.flutter_bcid.is_official_build()
   api.flutter_bcid.is_prod_build()
+  api.flutter_bcid.is_try_build()
   api.flutter_bcid.download_and_verify_provenance(
       "artifact.zip", "flutter_infra", "release_artifacts/artifacts.zip"
   )
diff --git a/recipe_modules/monorepo/api.py b/recipe_modules/monorepo/api.py
index 69f24e2..789810b 100644
--- a/recipe_modules/monorepo/api.py
+++ b/recipe_modules/monorepo/api.py
@@ -12,6 +12,10 @@
   """Provides utilities to work with monorepo checkouts."""
 
   @property
+  def is_monorepo(self):
+    return self.is_monorepo_ci_build or self.is_monorepo_try_build
+
+  @property
   def is_monorepo_ci_build(self):
     commit = self.m.buildbucket.build.input.gitiles_commit
     return commit.project == 'monorepo'
@@ -26,7 +30,7 @@
     )
 
   @property
-  def try_build_identifier(self):
+  def build_identifier(self):
     """Creates a unique identifier to use as an upload path for artifacts.
 
     If this is a subbuild spawned by an engine_v2 coordinator, use
@@ -43,9 +47,9 @@
 
     Returns:
       The buildbucket id of the engine_v2/engine_v2 coordinator build or
-      the try_build_identifer input property passed to this build.
-"""
-    parent_identifier = self.m.properties.get('try_build_identifier')
+      the build_identifer input property passed to this build.
+    """
+    parent_identifier = self.m.properties.get('build_identifier')
     if (parent_identifier):
       return str(parent_identifier)
     buildbucket_id = self.m.buildbucket.build.id
diff --git a/recipe_modules/monorepo/test_api.py b/recipe_modules/monorepo/test_api.py
index dee2c53..fa13f50 100644
--- a/recipe_modules/monorepo/test_api.py
+++ b/recipe_modules/monorepo/test_api.py
@@ -16,7 +16,7 @@
         git_repo='https://dart.googlesource.com/monorepo',
         git_ref=git_ref,
         revision='a' * 40,
-        build_number=123,
+        build_id=123,
     )
 
   def try_build(self, **kwargs):
diff --git a/recipe_modules/monorepo/tests/test_monorepo.expected/engine_build.json b/recipe_modules/monorepo/tests/test_monorepo.expected/engine_build.json
index b0aa02a..ef10958 100644
--- a/recipe_modules/monorepo/tests/test_monorepo.expected/engine_build.json
+++ b/recipe_modules/monorepo/tests/test_monorepo.expected/engine_build.json
@@ -1,9 +1,18 @@
 [
   {
     "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "test",
     "~followup_annotations": [
+      "@@@SET_BUILD_PROPERTY@build_identifier@\"8945511751514863184\"@@@",
       "@@@SET_BUILD_PROPERTY@is_ci_build@false@@@",
+      "@@@SET_BUILD_PROPERTY@is_monorepo@false@@@",
       "@@@SET_BUILD_PROPERTY@is_try_build@false@@@"
     ]
   },
diff --git a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_ci_build.json b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_ci_build.json
index 43df1c7..58780ec 100644
--- a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_ci_build.json
+++ b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_ci_build.json
@@ -1,9 +1,18 @@
 [
   {
     "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "test",
     "~followup_annotations": [
+      "@@@SET_BUILD_PROPERTY@build_identifier@\"123\"@@@",
       "@@@SET_BUILD_PROPERTY@is_ci_build@true@@@",
+      "@@@SET_BUILD_PROPERTY@is_monorepo@true@@@",
       "@@@SET_BUILD_PROPERTY@is_try_build@false@@@"
     ]
   },
diff --git a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build.json b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build.json
index ea25635..5201d2b 100644
--- a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build.json
+++ b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build.json
@@ -10,9 +10,10 @@
     "cmd": [],
     "name": "test",
     "~followup_annotations": [
+      "@@@SET_BUILD_PROPERTY@build_identifier@\"8945511751514863184\"@@@",
       "@@@SET_BUILD_PROPERTY@is_ci_build@false@@@",
-      "@@@SET_BUILD_PROPERTY@is_try_build@true@@@",
-      "@@@SET_BUILD_PROPERTY@try_build_identifier@\"8945511751514863184\"@@@"
+      "@@@SET_BUILD_PROPERTY@is_monorepo@true@@@",
+      "@@@SET_BUILD_PROPERTY@is_try_build@true@@@"
     ]
   },
   {
diff --git a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build_no_builder_id.json b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build_no_builder_id.json
index 78c583f..9fe1a48 100644
--- a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build_no_builder_id.json
+++ b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_build_no_builder_id.json
@@ -24,9 +24,9 @@
       "    return callable_obj(*props, **additional_args)",
       "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
       "  File \"RECIPE_REPO[flutter]/recipe_modules/monorepo/tests/test_monorepo.py\", line 17, in RunSteps",
-      "    try_build_identifier = api.monorepo.try_build_identifier",
-      "                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/monorepo/api.py\", line 55, in try_build_identifier",
+      "    build_identifier = api.monorepo.build_identifier",
+      "                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/monorepo/api.py\", line 59, in build_identifier",
       "    self.m.step.empty(",
       "  File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in empty",
       "    ret.presentation.status = status",
diff --git a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_subbuild.json b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_subbuild.json
index fbaeb0b..e7478b2 100644
--- a/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_subbuild.json
+++ b/recipe_modules/monorepo/tests/test_monorepo.expected/monorepo_try_subbuild.json
@@ -3,9 +3,10 @@
     "cmd": [],
     "name": "test",
     "~followup_annotations": [
+      "@@@SET_BUILD_PROPERTY@build_identifier@\"81123491\"@@@",
       "@@@SET_BUILD_PROPERTY@is_ci_build@false@@@",
-      "@@@SET_BUILD_PROPERTY@is_try_build@true@@@",
-      "@@@SET_BUILD_PROPERTY@try_build_identifier@\"81123491\"@@@"
+      "@@@SET_BUILD_PROPERTY@is_monorepo@true@@@",
+      "@@@SET_BUILD_PROPERTY@is_try_build@true@@@"
     ]
   },
   {
diff --git a/recipe_modules/monorepo/tests/test_monorepo.py b/recipe_modules/monorepo/tests/test_monorepo.py
index 4e43282..bc2ceb2 100644
--- a/recipe_modules/monorepo/tests/test_monorepo.py
+++ b/recipe_modules/monorepo/tests/test_monorepo.py
@@ -13,13 +13,13 @@
 def RunSteps(api):
   is_ci_build = api.monorepo.is_monorepo_ci_build
   is_try_build = api.monorepo.is_monorepo_try_build
-  if is_try_build:
-    try_build_identifier = api.monorepo.try_build_identifier
+  is_monorepo = api.monorepo.is_monorepo
+  build_identifier = api.monorepo.build_identifier
   presentation = api.step.empty('test').presentation
   presentation.properties['is_ci_build'] = is_ci_build
   presentation.properties['is_try_build'] = is_try_build
-  if is_try_build:
-    presentation.properties['try_build_identifier'] = try_build_identifier
+  presentation.properties['is_monorepo'] = is_monorepo
+  presentation.properties['build_identifier'] = build_identifier
 
 
 def GenTests(api):
@@ -30,7 +30,7 @@
   yield api.test(
       'monorepo_try_subbuild',
       api.monorepo.try_build(),
-      api.properties(try_build_identifier='81123491'),
+      api.properties(build_identifier='81123491'),
   )
 
   yield api.test(
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index a0ed408..8efca11 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -404,7 +404,7 @@
       )
     return self.m.properties.get('git_branch', '')
 
-  def flutter_environment(self, checkout_path):
+  def flutter_environment(self, checkout_path, clear_features=True):
     """Returns env and env_prefixes of an flutter/dart command environment."""
     dart_bin = checkout_path.join('bin', 'cache', 'dart-sdk', 'bin')
     flutter_bin = checkout_path.join('bin')
@@ -455,8 +455,8 @@
          ] = 'https://storage.googleapis.com/flutter_archives_v2'
     env_prefixes = {'PATH': ['%s' % str(flutter_bin), '%s' % str(dart_bin)]}
     flutter_exe = 'flutter.bat' if self.m.platform.is_win else 'flutter'
-    if (not self.m.monorepo.is_monorepo_ci_build and
-        not self.m.monorepo.is_monorepo_try_build):
+    # If setting environment from engine_v2 do not clear features.
+    if clear_features and not self.m.monorepo.is_monorepo:
       self.m.step(
           'flutter config --clear-features',
           [flutter_bin.join(flutter_exe), 'config', '--clear-features'],
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo.json b/recipe_modules/repo_util/examples/full.expected/monorepo.json
index 05535cc..92f11e8 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -73,7 +73,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -100,7 +100,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -131,7 +131,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -163,7 +163,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -189,7 +189,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -214,7 +214,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -243,7 +243,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -268,7 +268,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -295,7 +295,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -326,7 +326,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -358,7 +358,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -384,7 +384,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -409,7 +409,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -438,7 +438,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -463,7 +463,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -490,7 +490,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -521,7 +521,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -553,7 +553,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -579,7 +579,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -604,7 +604,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -633,7 +633,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -658,7 +658,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -685,7 +685,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -716,7 +716,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -748,7 +748,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -774,7 +774,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -799,7 +799,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -828,7 +828,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -853,7 +853,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -880,7 +880,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -911,7 +911,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -942,7 +942,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -968,7 +968,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -993,7 +993,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1022,7 +1022,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1047,7 +1047,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1074,7 +1074,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1099,7 +1099,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1126,7 +1126,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1159,7 +1159,7 @@
       "refs/heads/main"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "GIT_BACKENDINFO": "1",
       "GIT_DAPPER_TRACE": "1",
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -1187,7 +1187,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1299,7 +1299,7 @@
       "runhooks"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184"
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1316,7 +1316,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1347,7 +1347,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1378,7 +1378,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1404,7 +1404,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1429,7 +1429,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1458,7 +1458,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1483,7 +1483,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1510,7 +1510,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1539,7 +1539,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json b/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
index 1beb272..e04c155 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -73,7 +73,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -100,7 +100,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -131,7 +131,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -163,7 +163,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -189,7 +189,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -214,7 +214,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -243,7 +243,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -268,7 +268,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -295,7 +295,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -326,7 +326,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -358,7 +358,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -384,7 +384,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -409,7 +409,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -438,7 +438,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -463,7 +463,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -490,7 +490,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -521,7 +521,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -553,7 +553,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -579,7 +579,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -604,7 +604,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -633,7 +633,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -658,7 +658,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -685,7 +685,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -716,7 +716,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -748,7 +748,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -774,7 +774,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -799,7 +799,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -828,7 +828,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -853,7 +853,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -880,7 +880,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -911,7 +911,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -942,7 +942,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -968,7 +968,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -993,7 +993,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1022,7 +1022,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1047,7 +1047,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1074,7 +1074,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1099,7 +1099,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1126,7 +1126,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1166,7 +1166,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1202,7 +1202,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1240,7 +1240,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1272,7 +1272,7 @@
       "refs/heads/main"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "GIT_BACKENDINFO": "1",
       "GIT_DAPPER_TRACE": "1",
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -1300,7 +1300,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1432,14 +1432,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "Checkout source code.upload git traces.compress traces",
-    "stdin": "{\"archive_type\": \"zip\", \"entries\": [{\"path\": \"[CLEANUP]/trace2-event\", \"type\": \"file\"}, {\"path\": \"[CLEANUP]/trace-curl\", \"type\": \"file\"}, {\"path\": \"[CLEANUP]/trace-packet\", \"type\": \"file\"}], \"output\": \"[CLEANUP]/8945511751514863184.zip\", \"root\": \"[CLEANUP]\"}",
+    "stdin": "{\"archive_type\": \"zip\", \"entries\": [{\"path\": \"[CLEANUP]/trace2-event\", \"type\": \"file\"}, {\"path\": \"[CLEANUP]/trace-curl\", \"type\": \"file\"}, {\"path\": \"[CLEANUP]/trace-packet\", \"type\": \"file\"}], \"output\": \"[CLEANUP]/123.zip\", \"root\": \"[CLEANUP]\"}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1453,7 +1453,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CLEANUP]/8945511751514863184.zip",
+      "[CLEANUP]/123.zip",
       "gs://chrome-bot-traces"
     ],
     "env_suffixes": {
@@ -1471,7 +1471,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1509,7 +1509,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1547,7 +1547,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1587,7 +1587,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1627,7 +1627,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1663,7 +1663,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1701,7 +1701,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1733,7 +1733,7 @@
       "refs/heads/main"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "GIT_BACKENDINFO": "1",
       "GIT_DAPPER_TRACE": "1",
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -1761,7 +1761,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1873,7 +1873,7 @@
       "runhooks"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184"
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1890,7 +1890,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1921,7 +1921,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1952,7 +1952,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1978,7 +1978,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2003,7 +2003,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2032,7 +2032,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2057,7 +2057,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2084,7 +2084,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2113,7 +2113,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
index 14c3314..efa4063 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
@@ -17,7 +17,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -44,7 +44,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -73,7 +73,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -100,7 +100,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -129,7 +129,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -156,7 +156,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -187,7 +187,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -219,7 +219,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -245,7 +245,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -270,7 +270,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -299,7 +299,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -324,7 +324,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -351,7 +351,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -382,7 +382,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -414,7 +414,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -440,7 +440,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -465,7 +465,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -494,7 +494,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -519,7 +519,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -546,7 +546,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -577,7 +577,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -609,7 +609,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -635,7 +635,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -660,7 +660,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -689,7 +689,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -714,7 +714,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -741,7 +741,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -772,7 +772,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -804,7 +804,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -830,7 +830,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -855,7 +855,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -884,7 +884,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -909,7 +909,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -936,7 +936,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -967,7 +967,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -998,7 +998,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1024,7 +1024,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1049,7 +1049,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1078,7 +1078,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1103,7 +1103,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1130,7 +1130,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1159,7 +1159,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1186,7 +1186,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1215,7 +1215,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1242,7 +1242,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1271,7 +1271,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1298,7 +1298,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1323,7 +1323,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1349,7 +1349,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1376,7 +1376,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1406,7 +1406,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1443,7 +1443,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1479,7 +1479,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1517,7 +1517,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1549,7 +1549,7 @@
       "refs/heads/beta"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "GIT_BACKENDINFO": "1",
       "GIT_DAPPER_TRACE": "1",
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -1577,7 +1577,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1689,7 +1689,7 @@
       "runhooks"
     ],
     "env": {
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184"
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1706,7 +1706,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1737,7 +1737,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1768,7 +1768,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1794,7 +1794,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1819,7 +1819,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1848,7 +1848,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1873,7 +1873,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1900,7 +1900,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1929,7 +1929,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipe_modules/shard_util/api.py b/recipe_modules/shard_util/api.py
index 28c20b2..e18ff3c 100644
--- a/recipe_modules/shard_util/api.py
+++ b/recipe_modules/shard_util/api.py
@@ -32,10 +32,21 @@
 
 # Environments map to calculate the environment from the bucket.
 ENVIRONMENTS_MAP = {
-    'try': '', 'staging': 'Staging ', 'flutter': 'Production ',
+    'try': '',
+    'staging': 'Staging ',
+    'flutter': 'Production ',
     'prod': 'Production '
 }
 
+# Name of the build property to store the orchestrator parent commit.
+# This is used to keep the engine commit even when running framework
+# global tests.
+PARENT_COMMIT = 'parent_commit'
+
+# Name of the property to store the buildbucket identifier.
+# used to namespace the engine artifacts gcs upload location.
+BUILD_IDENTIFIER = 'build_identifier'
+
 
 @attr.s
 class SubbuildResult(object):
@@ -211,6 +222,7 @@
           self.m.platform.name
       )
 
+      drone_properties[PARENT_COMMIT] = build.get(PARENT_COMMIT, '')
       # Buildbucket properties are not propagated to sub-builds when running with
       # led. Copy the properties bb gitiles_commit to git_ref and git_url if not
       # set already. Try jobs from a Gerrit CL have an empty gitiles_commit, they
@@ -225,10 +237,8 @@
 
       # Override recipe.
       drone_properties['recipe'] = build['recipe']
-      # Pass try build identifier to subbuilds
-      if self.m.monorepo.is_monorepo_try_build:
-        drone_properties['try_build_identifier'
-                        ] = self.m.monorepo.try_build_identifier
+      # Always pass build identifier to subbuilds
+      drone_properties[BUILD_IDENTIFIER] = self.m.monorepo.build_identifier
       builder_name, bucket = self._drone_name(build)
       parent = self.m.buildbucket.build
       led_data = self.m.led(
@@ -358,10 +368,9 @@
         task_dimensions.append(common_pb2.RequestedDimension(key=k, value=v))
       # Override recipe.
       drone_properties['recipe'] = build['recipe']
-      # Pass try build identifier to subbuilds
-      if self.m.monorepo.is_monorepo_try_build:
-        drone_properties['try_build_identifier'
-                        ] = self.m.monorepo.try_build_identifier
+      drone_properties[PARENT_COMMIT] = build.get(PARENT_COMMIT, '')
+      # Always pass build identifier to subbuilds
+      drone_properties[BUILD_IDENTIFIER] = self.m.monorepo.build_identifier
       properties = collections.OrderedDict(
           (key, val)
           for key, val in sorted(drone_properties.items())
diff --git a/recipe_modules/shard_util/examples/full.expected/monorepo_bb_subbuilds.json b/recipe_modules/shard_util/examples/full.expected/monorepo_bb_subbuilds.json
index 39b3b44..6fb3b25 100644
--- a/recipe_modules/shard_util/examples/full.expected/monorepo_bb_subbuilds.json
+++ b/recipe_modules/shard_util/examples/full.expected/monorepo_bb_subbuilds.json
@@ -4,6 +4,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -17,14 +25,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-win-ios_debug\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"os\", \"value\": \"Windows-10\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Windows-10\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-win-ios_debug\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"os\", \"value\": \"Windows-10\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Windows-10\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"123\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"123-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -105,8 +113,10 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"mytask\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": [@@@",
@@ -124,14 +134,14 @@
       "@@@STEP_LOG_LINE@request@            }@@@",
       "@@@STEP_LOG_LINE@request@          ]@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
@@ -174,7 +184,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -200,7 +210,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -303,7 +313,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -332,7 +342,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -371,7 +381,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -402,7 +412,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -444,7 +454,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -475,7 +485,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -491,6 +501,14 @@
     "name": "launch builds (2)"
   },
   {
+    "cmd": [],
+    "name": "launch builds (2).get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -504,14 +522,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds (2).schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-None-felt_test\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/tester\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-None-felt_test\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}, \"build_identifier\": \"123\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/tester\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"123-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -574,8 +592,10 @@
       "@@@STEP_LOG_LINE@request@              \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@request@            ]@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"mytask\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": [@@@",
@@ -593,14 +613,14 @@
       "@@@STEP_LOG_LINE@request@            }@@@",
       "@@@STEP_LOG_LINE@request@          ]@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-00000000133a\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
diff --git a/recipe_modules/shard_util/examples/full.expected/monorepo_led_subbuilds.json b/recipe_modules/shard_util/examples/full.expected/monorepo_led_subbuilds.json
index 30cfcbf..fe67f0f 100644
--- a/recipe_modules/shard_util/examples/full.expected/monorepo_led_subbuilds.json
+++ b/recipe_modules/shard_util/examples/full.expected/monorepo_led_subbuilds.json
@@ -4,6 +4,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "led",
       "get-builder",
@@ -16,7 +24,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -76,6 +84,8 @@
       "-p",
       "build={\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Linux\"], \"gn\": [], \"name\": \"ios_debug\", \"ninja\": [\"ios_debug\"], \"recipe\": \"engine_v2/builder\"}",
       "-p",
+      "build_identifier=\"123\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
@@ -84,6 +94,8 @@
       "-p",
       "git_url=\"https://dart.googlesource.com/monorepo\"",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/builder\"",
       "-p",
       "task_name=\"ios_debug\"",
@@ -96,7 +108,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -166,10 +178,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -208,14 +222,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -278,10 +292,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -321,14 +337,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -391,10 +407,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -434,14 +452,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -504,10 +522,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -547,14 +567,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led edit (5)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -617,10 +637,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -660,14 +682,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led edit (6)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -730,10 +752,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -773,14 +797,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led edit (7)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -862,10 +886,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -905,14 +931,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-linux-ios_debug\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -953,7 +979,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -979,7 +1005,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1082,7 +1108,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1111,7 +1137,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1150,7 +1176,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1181,7 +1207,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1223,7 +1249,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1254,7 +1280,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1270,6 +1296,14 @@
     "name": "launch builds (2)"
   },
   {
+    "cmd": [],
+    "name": "launch builds (2).get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "led",
       "get-builder",
@@ -1282,7 +1316,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1342,6 +1376,8 @@
       "-p",
       "build={\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}",
       "-p",
+      "build_identifier=\"123\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
@@ -1350,6 +1386,8 @@
       "-p",
       "git_url=\"https://dart.googlesource.com/monorepo\"",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/tester\"",
       "-p",
       "task_name=\"felt_test\"",
@@ -1362,7 +1400,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1437,10 +1475,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1479,14 +1519,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds (2).led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1554,10 +1594,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1597,14 +1639,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds (2).led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1672,10 +1714,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1715,14 +1759,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds (2).led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1809,10 +1853,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://dart.googlesource.com/monorepo\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1852,14 +1898,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds (2).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci.sandbox\",\n          \"builder\": \"flutter-None-felt_test\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"123\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://dart.googlesource.com/monorepo\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/shard_util/examples/full.expected/monorepo_try_bb_subbuilds.json b/recipe_modules/shard_util/examples/full.expected/monorepo_try_bb_subbuilds.json
index c6c35ff..62e4b6c 100644
--- a/recipe_modules/shard_util/examples/full.expected/monorepo_try_bb_subbuilds.json
+++ b/recipe_modules/shard_util/examples/full.expected/monorepo_try_bb_subbuilds.json
@@ -32,7 +32,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try.monorepo\", \"builder\": \"flutter-win-ios_debug-try\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"os\", \"value\": \"Windows-10\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"9425\", \"host\": \"dart-review.googlesource.com\", \"patchset\": \"3\", \"project\": \"sdk\"}], \"priority\": 30, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Windows-10\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}], \"try_build_identifier\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try.monorepo\", \"builder\": \"flutter-win-ios_debug-try\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"os\", \"value\": \"Windows-10\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"9425\", \"host\": \"dart-review.googlesource.com\", \"patchset\": \"3\", \"project\": \"sdk\"}], \"priority\": 30, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Windows-10\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,8 +115,10 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"mytask\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": [@@@",
@@ -132,8 +134,7 @@
       "@@@STEP_LOG_LINE@request@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@request@              ]@@@",
       "@@@STEP_LOG_LINE@request@            }@@@",
-      "@@@STEP_LOG_LINE@request@          ],@@@",
-      "@@@STEP_LOG_LINE@request@          \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@          ]@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
@@ -534,7 +535,7 @@
       }
     },
     "name": "launch builds (2).schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try.monorepo\", \"builder\": \"flutter-None-felt_test-try\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"9425\", \"host\": \"dart-review.googlesource.com\", \"patchset\": \"3\", \"project\": \"sdk\"}], \"priority\": 30, \"properties\": {\"build\": {\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/tester\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}], \"try_build_identifier\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try.monorepo\", \"builder\": \"flutter-None-felt_test-try\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"9425\", \"host\": \"dart-review.googlesource.com\", \"patchset\": \"3\", \"project\": \"sdk\"}], \"priority\": 30, \"properties\": {\"build\": {\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/tester\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -599,8 +600,10 @@
       "@@@STEP_LOG_LINE@request@              \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@request@            ]@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"mytask\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": [@@@",
@@ -616,8 +619,7 @@
       "@@@STEP_LOG_LINE@request@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@request@              ]@@@",
       "@@@STEP_LOG_LINE@request@            }@@@",
-      "@@@STEP_LOG_LINE@request@          ],@@@",
-      "@@@STEP_LOG_LINE@request@          \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@          ]@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
diff --git a/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_subbuilds.json b/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_subbuilds.json
index 84392c3..b53de31 100644
--- a/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_subbuilds.json
+++ b/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_subbuilds.json
@@ -84,17 +84,19 @@
       "-p",
       "build={\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Linux\"], \"gn\": [], \"name\": \"ios_debug\", \"ninja\": [\"ios_debug\"], \"recipe\": \"engine_v2/builder\"}",
       "-p",
+      "build_identifier=\"8945511751514863184\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/builder\"",
       "-p",
       "task_name=\"ios_debug\"",
       "-p",
-      "tests=[{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]",
-      "-p",
-      "try_build_identifier=\"8945511751514863184\""
+      "tests=[{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]"
     ],
     "luci_context": {
       "realm": {
@@ -172,8 +174,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -189,8 +193,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -220,7 +223,7 @@
       }
     },
     "name": "launch builds.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -283,8 +286,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -300,8 +305,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -332,7 +336,7 @@
       }
     },
     "name": "launch builds.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -395,8 +399,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -412,8 +418,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -444,7 +449,7 @@
       }
     },
     "name": "launch builds.led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -507,8 +512,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -524,8 +531,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -556,7 +562,7 @@
       }
     },
     "name": "launch builds.led edit (5)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -619,8 +625,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -636,8 +644,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -668,7 +675,7 @@
       }
     },
     "name": "launch builds.led edit (6)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -731,8 +738,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -748,8 +757,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -780,7 +788,7 @@
       }
     },
     "name": "launch builds.led edit (7)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -862,8 +870,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -879,8 +889,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -910,7 +919,7 @@
       }
     },
     "name": "launch builds.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1000,8 +1009,10 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1017,8 +1028,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -1049,7 +1059,7 @@
       }
     },
     "name": "launch builds.led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"9425\",\n              \"host\": \"dart-review.googlesource.com\",\n              \"patchset\": \"3\",\n              \"project\": \"sdk\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-linux-ios_debug-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"9425\",\n              \"host\": \"dart-review.googlesource.com\",\n              \"patchset\": \"3\",\n              \"project\": \"sdk\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1487,17 +1497,19 @@
       "-p",
       "build={\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}",
       "-p",
+      "build_identifier=\"8945511751514863184\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/tester\"",
       "-p",
       "task_name=\"felt_test\"",
       "-p",
-      "tests=[{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]",
-      "-p",
-      "try_build_identifier=\"8945511751514863184\""
+      "tests=[{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]"
     ],
     "luci_context": {
       "realm": {
@@ -1580,8 +1592,10 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1597,8 +1611,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -1628,7 +1641,7 @@
       }
     },
     "name": "launch builds (2).led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1696,8 +1709,10 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1713,8 +1728,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -1745,7 +1759,7 @@
       }
     },
     "name": "launch builds (2).led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1813,8 +1827,10 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1830,8 +1846,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -1862,7 +1877,7 @@
       }
     },
     "name": "launch builds (2).led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1949,8 +1964,10 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1966,8 +1983,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -1997,7 +2013,7 @@
       }
     },
     "name": "launch builds (2).led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -2092,8 +2108,10 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -2109,8 +2127,7 @@
       "@@@STEP_LOG_LINE@proto.output@                  \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@                ]@@@",
       "@@@STEP_LOG_LINE@proto.output@              }@@@",
-      "@@@STEP_LOG_LINE@proto.output@            ],@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@            ]@@@",
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
@@ -2141,7 +2158,7 @@
       }
     },
     "name": "launch builds (2).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"9425\",\n              \"host\": \"dart-review.googlesource.com\",\n              \"patchset\": \"3\",\n              \"project\": \"sdk\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ],\n            \"try_build_identifier\": \"8945511751514863184\"\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try.monorepo\",\n          \"builder\": \"flutter-None-felt_test-try\",\n          \"project\": \"dart\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"9425\",\n              \"host\": \"dart-review.googlesource.com\",\n              \"patchset\": \"3\",\n              \"project\": \"sdk\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_without_builder_id.json b/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_without_builder_id.json
index b9ce7fd..3b7c104 100644
--- a/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_without_builder_id.json
+++ b/recipe_modules/shard_util/examples/full.expected/monorepo_try_led_without_builder_id.json
@@ -36,16 +36,16 @@
       "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/examples/full.py\", line 42, in RunSteps",
       "    reqs = api.shard_util.schedule_builds(build_configs, presentation)",
       "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/api.py\", line 139, in schedule_builds",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/api.py\", line 150, in schedule_builds",
       "    return self.schedule(updated_builds, presentation, branch=branch)",
       "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/api.py\", line 179, in schedule",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/api.py\", line 190, in schedule",
       "    builds = self._schedule_with_led(build_list)",
       "             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/api.py\", line 231, in _schedule_with_led",
-      "    ] = self.m.monorepo.try_build_identifier",
-      "        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/monorepo/api.py\", line 55, in try_build_identifier",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/shard_util/api.py\", line 241, in _schedule_with_led",
+      "    drone_properties[BUILD_IDENTIFIER] = self.m.monorepo.build_identifier",
+      "                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/monorepo/api.py\", line 59, in build_identifier",
       "    self.m.step.empty(",
       "  File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in empty",
       "    ret.presentation.status = status",
diff --git a/recipe_modules/shard_util/examples/full.expected/presubmit_bb.json b/recipe_modules/shard_util/examples/full.expected/presubmit_bb.json
index ffc367d..eb67c69 100644
--- a/recipe_modules/shard_util/examples/full.expected/presubmit_bb.json
+++ b/recipe_modules/shard_util/examples/full.expected/presubmit_bb.json
@@ -4,6 +4,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -24,7 +32,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Windows Engine Drone\", \"project\": \"fuchsia\"}, \"dimensions\": [{\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"os\", \"value\": \"Windows-10\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Windows-10\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"git_ref\": \"refs/123/main\", \"git_url\": \"http://abc\", \"no_goma\": \"true\", \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Windows Engine Drone\", \"project\": \"fuchsia\"}, \"dimensions\": [{\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"os\", \"value\": \"Windows-10\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Windows-10\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"git_ref\": \"refs/123/main\", \"git_url\": \"http://abc\", \"no_goma\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -106,11 +114,13 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@request@          \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@request@          \"git_url\": \"http://abc\",@@@",
       "@@@STEP_LOG_LINE@request@          \"no_goma\": \"true\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"mytask\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": [@@@",
diff --git a/recipe_modules/shard_util/examples/full.expected/presubmit_led.json b/recipe_modules/shard_util/examples/full.expected/presubmit_led.json
index de78f09..087d9fc 100644
--- a/recipe_modules/shard_util/examples/full.expected/presubmit_led.json
+++ b/recipe_modules/shard_util/examples/full.expected/presubmit_led.json
@@ -4,6 +4,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "led",
       "get-builder",
@@ -76,6 +84,8 @@
       "-p",
       "build={\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Linux\"], \"gn\": [], \"name\": \"ios_debug\", \"ninja\": [\"ios_debug\"], \"recipe\": \"engine_v2/builder\"}",
       "-p",
+      "build_identifier=\"8945511751514863184\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
@@ -84,6 +94,8 @@
       "-p",
       "git_url=\"http://abc\"",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/builder\"",
       "-p",
       "task_name=\"ios_debug\"",
@@ -166,10 +178,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -215,7 +229,7 @@
       }
     },
     "name": "launch builds.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -278,10 +292,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -328,7 +344,7 @@
       }
     },
     "name": "launch builds.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -391,10 +407,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -441,7 +459,7 @@
       }
     },
     "name": "launch builds.led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -504,10 +522,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -554,7 +574,7 @@
       }
     },
     "name": "launch builds.led edit (5)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -617,10 +637,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -667,7 +689,7 @@
       }
     },
     "name": "launch builds.led edit (6)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -730,10 +752,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -780,7 +804,7 @@
       }
     },
     "name": "launch builds.led edit (7)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -862,10 +886,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -912,7 +938,7 @@
       }
     },
     "name": "launch builds.led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1270,6 +1296,14 @@
     "name": "launch builds (2)"
   },
   {
+    "cmd": [],
+    "name": "launch builds (2).get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "led",
       "get-builder",
@@ -1342,6 +1376,8 @@
       "-p",
       "build={\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}",
       "-p",
+      "build_identifier=\"8945511751514863184\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
@@ -1350,6 +1386,8 @@
       "-p",
       "git_url=\"http://abc\"",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/tester\"",
       "-p",
       "task_name=\"felt_test\"",
@@ -1437,10 +1475,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1486,7 +1526,7 @@
       }
     },
     "name": "launch builds (2).led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1554,10 +1594,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1604,7 +1646,7 @@
       }
     },
     "name": "launch builds (2).led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1672,10 +1714,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1722,7 +1766,7 @@
       }
     },
     "name": "launch builds (2).led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1809,10 +1853,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"refs/123/main\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"http://abc\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1859,7 +1905,7 @@
       }
     },
     "name": "launch builds (2).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"refs/123/main\",\n            \"git_url\": \"http://abc\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/shard_util/examples/full.expected/presubmit_led_subbuilds.json b/recipe_modules/shard_util/examples/full.expected/presubmit_led_subbuilds.json
index 2f92e65..6048011 100644
--- a/recipe_modules/shard_util/examples/full.expected/presubmit_led_subbuilds.json
+++ b/recipe_modules/shard_util/examples/full.expected/presubmit_led_subbuilds.json
@@ -4,6 +4,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "led",
       "get-builder",
@@ -76,6 +84,8 @@
       "-p",
       "build={\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_dimensions\": [\"dimension1=abc\", \"os=Linux\"], \"gn\": [], \"name\": \"ios_debug\", \"ninja\": [\"ios_debug\"], \"recipe\": \"engine_v2/builder\"}",
       "-p",
+      "build_identifier=\"8945511751514863184\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
@@ -84,6 +94,8 @@
       "-p",
       "git_url=\"https://github.com/repo/a\"",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/builder\"",
       "-p",
       "task_name=\"ios_debug\"",
@@ -166,10 +178,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -215,7 +229,7 @@
       }
     },
     "name": "launch builds.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -278,10 +292,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -328,7 +344,7 @@
       }
     },
     "name": "launch builds.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -391,10 +407,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -441,7 +459,7 @@
       }
     },
     "name": "launch builds.led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -504,10 +522,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -554,7 +574,7 @@
       }
     },
     "name": "launch builds.led edit (5)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -617,10 +637,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -667,7 +689,7 @@
       }
     },
     "name": "launch builds.led edit (6)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -730,10 +752,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -780,7 +804,7 @@
       }
     },
     "name": "launch builds.led edit (7)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -862,10 +886,12 @@
       "@@@STEP_LOG_LINE@proto.output@              ],@@@",
       "@@@STEP_LOG_LINE@proto.output@              \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"ios_debug\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -912,7 +938,7 @@
       }
     },
     "name": "launch builds.led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"Linux Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dimensions\": {\n                \"cpu\": \"arm64\"\n              },\n              \"drone_dimensions\": [\n                \"dimension1=abc\",\n                \"os=Linux\"\n              ],\n              \"gn\": [],\n              \"name\": \"ios_debug\",\n              \"ninja\": [\n                \"ios_debug\"\n              ],\n              \"recipe\": \"engine_v2/builder\"\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/builder\",\n            \"task_name\": \"ios_debug\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"ios_debug\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1270,6 +1296,14 @@
     "name": "launch builds (2)"
   },
   {
+    "cmd": [],
+    "name": "launch builds (2).get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "led",
       "get-builder",
@@ -1342,6 +1376,8 @@
       "-p",
       "build={\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [{\"full_build\": \"123\", \"ios_debug\": \"bcd\", \"web_tests\": \"abc\"}], \"scripts\": [\"out/script.sh\"]}",
       "-p",
+      "build_identifier=\"8945511751514863184\"",
+      "-p",
       "environment=\"Staging\"",
       "-p",
       "gclient_variables={}",
@@ -1350,6 +1386,8 @@
       "-p",
       "git_url=\"https://github.com/repo/a\"",
       "-p",
+      "parent_commit=\"\"",
+      "-p",
       "recipe=\"engine_v2/tester\"",
       "-p",
       "task_name=\"felt_test\"",
@@ -1437,10 +1475,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1486,7 +1526,7 @@
       }
     },
     "name": "launch builds (2).led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1554,10 +1594,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1604,7 +1646,7 @@
       }
     },
     "name": "launch builds (2).led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1672,10 +1714,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1722,7 +1766,7 @@
       }
     },
     "name": "launch builds (2).led edit (4)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1809,10 +1853,12 @@
       "@@@STEP_LOG_LINE@proto.output@                \"out/script.sh\"@@@",
       "@@@STEP_LOG_LINE@proto.output@              ]@@@",
       "@@@STEP_LOG_LINE@proto.output@            },@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"git_url\": \"https://github.com/repo/a\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@            \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"task_name\": \"felt_test\",@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"tests\": [@@@",
@@ -1859,7 +1905,7 @@
       }
     },
     "name": "launch builds (2).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \" Engine Drone\",\n          \"project\": \"proj\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"87654321\",\n        \"infra\": {\n          \"backend\": {\n            \"config\": {\n              \"priority\": 10.0\n            },\n            \"task\": {\n              \"id\": {\n                \"target\": \"swarming://chromium-swarm\"\n              }\n            }\n          },\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                        \"size_bytes\": \"91\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:87654321\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"project\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/led\": {\n              \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n              \"rbe_cas_input\": {\n                \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n                \"digest\": {\n                  \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n                  \"size_bytes\": 91.0\n                }\n              }\n            },\n            \"build\": {\n              \"dependencies\": [\n                \"ios_debug\"\n              ],\n              \"name\": \"felt_test\",\n              \"parameters\": [\n                \"test\"\n              ],\n              \"recipe\": \"engine_v2/tester\",\n              \"resolved_deps\": [\n                {\n                  \"full_build\": \"123\",\n                  \"ios_debug\": \"bcd\",\n                  \"web_tests\": \"abc\"\n                }\n              ],\n              \"scripts\": [\n                \"out/script.sh\"\n              ]\n            },\n            \"build_identifier\": \"8945511751514863184\",\n            \"environment\": \"Staging\",\n            \"gclient_variables\": {},\n            \"git_ref\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n            \"git_url\": \"https://github.com/repo/a\",\n            \"parent_commit\": \"\",\n            \"recipe\": \"engine_v2/tester\",\n            \"task_name\": \"felt_test\",\n            \"tests\": [\n              {\n                \"dependencies\": [\n                  \"ios_debug\"\n                ],\n                \"name\": \"felt_test\",\n                \"parameters\": [\n                  \"test\"\n                ],\n                \"scripts\": [\n                  \"out/script.sh\"\n                ]\n              }\n            ]\n          }\n        }\n      }\n    },\n    \"name\": \"felt_test\"\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json b/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
index 8783600..67f20a8 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
@@ -877,6 +877,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -897,7 +905,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"build_identifier\": \"8945511751514863184\", \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"parent_commit\": \"\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -965,6 +973,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"devicelab/devicelab_test_drone\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"dependencies\": [],@@@",
       "@@@STEP_LOG_LINE@request@          \"drone_dimensions\": [@@@",
       "@@@STEP_LOG_LINE@request@            \"os=Linux\"@@@",
@@ -975,6 +984,7 @@
       "@@@STEP_LOG_LINE@request@          \"git_ref\": \"refs/pull/1/head\",@@@",
       "@@@STEP_LOG_LINE@request@          \"os\": \"Linux\",@@@",
       "@@@STEP_LOG_LINE@request@          \"parent_builder\": \"Linux abc\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tags\": [],@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"abc\"@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json b/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
index 788724a..124c400 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
@@ -38,7 +38,7 @@
     ],
     "infra_step": true,
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Engine Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"test/repo\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"0\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Engine Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"build_identifier\": \"8112381\", \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"test/repo\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"parent_commit\": \"\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"0\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -96,6 +96,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"devicelab/devicelab_test_drone\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8112381\",@@@",
       "@@@STEP_LOG_LINE@request@          \"dependencies\": [],@@@",
       "@@@STEP_LOG_LINE@request@          \"drone_dimensions\": [@@@",
       "@@@STEP_LOG_LINE@request@            \"os=Linux\"@@@",
@@ -107,6 +108,7 @@
       "@@@STEP_LOG_LINE@request@          \"git_url\": \"test/repo\",@@@",
       "@@@STEP_LOG_LINE@request@          \"os\": \"Linux\",@@@",
       "@@@STEP_LOG_LINE@request@          \"parent_builder\": \"Linux abc\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tags\": [],@@@",
       "@@@STEP_LOG_LINE@request@          \"task_name\": \"abc\"@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
index be598e2..e9a8fb3 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
@@ -1065,6 +1065,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -1085,7 +1093,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"abc\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"abc\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"local_engine\": \"android-release\", \"local_engine_cas_hash\": \"isolatehashlocalengine/22\", \"local_engine_host\": \"host-release\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"rtifact\": \"def\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"abc\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"abc\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"build_identifier\": \"8945511751514863184\", \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"local_engine\": \"android-release\", \"local_engine_cas_hash\": \"isolatehashlocalengine/22\", \"local_engine_host\": \"host-release\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"parent_commit\": \"\", \"recipe\": \"devicelab/devicelab_test_drone\", \"rtifact\": \"def\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1153,6 +1161,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"devicelab/devicelab_test_drone\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"dependencies\": [],@@@",
       "@@@STEP_LOG_LINE@request@          \"drone_dimensions\": [@@@",
       "@@@STEP_LOG_LINE@request@            \"os=Linux\"@@@",
@@ -1165,6 +1174,7 @@
       "@@@STEP_LOG_LINE@request@          \"local_engine_host\": \"host-release\",@@@",
       "@@@STEP_LOG_LINE@request@          \"os\": \"Linux\",@@@",
       "@@@STEP_LOG_LINE@request@          \"parent_builder\": \"Linux abc\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
       "@@@STEP_LOG_LINE@request@          \"rtifact\": \"def\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tags\": [],@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
index b7624cb..8b517c1 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -2561,6 +2561,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -2581,7 +2589,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Mac Engine Drone\", \"project\": \"project\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"chromium.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"project\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Mac\", \"parent_builder\": \"Mac_ios abc\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Mac\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"os\": \"Mac\", \"parent_builder\": \"Mac_ios abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Mac Engine Drone\", \"project\": \"project\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"chromium.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"project\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Mac\", \"parent_builder\": \"Mac_ios abc\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"build_identifier\": \"8945511751514863184\", \"dependencies\": [], \"drone_dimensions\": [\"os=Mac\"], \"fake_data\": \"fake data\", \"gclient_variables\": {}, \"git_branch\": \"master\", \"os\": \"Mac\", \"parent_builder\": \"Mac_ios abc\", \"parent_commit\": \"\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2655,6 +2663,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"devicelab/devicelab_test_drone\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"dependencies\": [],@@@",
       "@@@STEP_LOG_LINE@request@          \"drone_dimensions\": [@@@",
       "@@@STEP_LOG_LINE@request@            \"os=Mac\"@@@",
@@ -2664,6 +2673,7 @@
       "@@@STEP_LOG_LINE@request@          \"git_branch\": \"master\",@@@",
       "@@@STEP_LOG_LINE@request@          \"os\": \"Mac\",@@@",
       "@@@STEP_LOG_LINE@request@          \"parent_builder\": \"Mac_ios abc\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@            \"ios\"@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.py b/recipes/devicelab/devicelab_drone_build_test.py
index af2f1fe..b75d025 100644
--- a/recipes/devicelab/devicelab_drone_build_test.py
+++ b/recipes/devicelab/devicelab_drone_build_test.py
@@ -117,7 +117,8 @@
     k, v = d.split('=')
     test_props[k] = v
   reqs.append({
-      'name': task_name, 'properties': test_props,
+      'name': task_name,
+      'properties': test_props,
       'drone_dimensions': drone_dimensions,
       'recipe': 'devicelab/devicelab_test_drone'
   })
@@ -233,7 +234,8 @@
           fake_data='fake data',
           artifact='def',
           git_ref='refs/pull/1/head',
-          git_url='test/repo'
+          git_url='test/repo',
+          build_identifier='8112381',
       ),
       api.repo_util.flutter_environment_data(checkout_dir=checkout_path),
       api.step_data(
@@ -287,7 +289,9 @@
           tags=['ios'],
           git_branch='master',
           fake_data='fake data',
-          **{'$flutter/osx_sdk': {'sdk_version': 'deadbeef',}}
+          **{'$flutter/osx_sdk': {
+              'sdk_version': 'deadbeef',
+          }}
       ), api.repo_util.flutter_environment_data(checkout_dir=checkout_path),
       api.platform.name('mac'),
       api.buildbucket.ci_build(git_ref='refs/heads/master',)
diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
index bd1c3b0..176f0b5 100644
--- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
@@ -3745,6 +3745,22 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -3798,7 +3814,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"web_tests-0\", \"properties\": {\"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"shard\": \"web_tests\", \"subshard\": \"0\", \"task_name\": \"web_tests-0\"}, \"recipe\": \"flutter/flutter_drone\"}, \"clobber\": true, \"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"main\", \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"goma_jobs\": \"200\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"recipe\": \"flutter/flutter_drone\", \"shard\": \"web_tests\", \"subshard\": \"0\", \"subshards\": [\"0\", \"1_last\"], \"task_name\": \"web_tests-0\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"web_tests-1_last\", \"properties\": {\"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"shard\": \"web_tests\", \"subshard\": \"1_last\", \"task_name\": \"web_tests-1_last\"}, \"recipe\": \"flutter/flutter_drone\"}, \"clobber\": true, \"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"main\", \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"goma_jobs\": \"200\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"recipe\": \"flutter/flutter_drone\", \"shard\": \"web_tests\", \"subshard\": \"1_last\", \"subshards\": [\"0\", \"1_last\"], \"task_name\": \"web_tests-1_last\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"web_tests-0\", \"properties\": {\"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"shard\": \"web_tests\", \"subshard\": \"0\", \"task_name\": \"web_tests-0\"}, \"recipe\": \"flutter/flutter_drone\"}, \"build_identifier\": \"8945511751514863184\", \"clobber\": true, \"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"main\", \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"goma_jobs\": \"200\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"parent_commit\": \"\", \"recipe\": \"flutter/flutter_drone\", \"shard\": \"web_tests\", \"subshard\": \"0\", \"subshards\": [\"0\", \"1_last\"], \"task_name\": \"web_tests-0\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"web_tests-1_last\", \"properties\": {\"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"shard\": \"web_tests\", \"subshard\": \"1_last\", \"task_name\": \"web_tests-1_last\"}, \"recipe\": \"flutter/flutter_drone\"}, \"build_identifier\": \"8945511751514863184\", \"clobber\": true, \"dependencies\": [{\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"}], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"main\", \"git_ref\": \"b6efc758213fdfffee1234465\", \"git_url\": \"https://github.com/flutter/flutter\", \"goma_jobs\": \"200\", \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"parent_commit\": \"\", \"recipe\": \"flutter/flutter_drone\", \"shard\": \"web_tests\", \"subshard\": \"1_last\", \"subshards\": [\"0\", \"1_last\"], \"task_name\": \"web_tests-1_last\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -3880,6 +3896,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"flutter/flutter_drone\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"clobber\": true,@@@",
       "@@@STEP_LOG_LINE@request@          \"dependencies\": [@@@",
       "@@@STEP_LOG_LINE@request@            {@@@",
@@ -3896,6 +3913,7 @@
       "@@@STEP_LOG_LINE@request@          \"git_url\": \"https://github.com/flutter/flutter\",@@@",
       "@@@STEP_LOG_LINE@request@          \"goma_jobs\": \"200\",@@@",
       "@@@STEP_LOG_LINE@request@          \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"flutter/flutter_drone\",@@@",
       "@@@STEP_LOG_LINE@request@          \"shard\": \"web_tests\",@@@",
       "@@@STEP_LOG_LINE@request@          \"subshard\": \"0\",@@@",
@@ -3977,6 +3995,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"flutter/flutter_drone\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"clobber\": true,@@@",
       "@@@STEP_LOG_LINE@request@          \"dependencies\": [@@@",
       "@@@STEP_LOG_LINE@request@            {@@@",
@@ -3993,6 +4012,7 @@
       "@@@STEP_LOG_LINE@request@          \"git_url\": \"https://github.com/flutter/flutter\",@@@",
       "@@@STEP_LOG_LINE@request@          \"goma_jobs\": \"200\",@@@",
       "@@@STEP_LOG_LINE@request@          \"local_web_sdk_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"flutter/flutter_drone\",@@@",
       "@@@STEP_LOG_LINE@request@          \"shard\": \"web_tests\",@@@",
       "@@@STEP_LOG_LINE@request@          \"subshard\": \"1_last\",@@@",
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 43770c4..6029d39 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -15,7 +15,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -40,7 +40,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -67,7 +67,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -92,7 +92,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -130,7 +130,7 @@
       "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
       "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
       "ENGINE_PATH": "[CACHE]/builder/engine",
       "GIT_BACKENDINFO": "1",
@@ -173,7 +173,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -290,7 +290,7 @@
       "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
       "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
       "ENGINE_PATH": "[CACHE]/builder/engine",
       "GIT_BRANCH": "",
@@ -322,7 +322,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -356,7 +356,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -385,7 +385,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -443,7 +443,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -534,7 +534,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -606,7 +606,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -670,7 +670,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -738,7 +738,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -798,7 +798,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -857,7 +857,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -918,7 +918,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -975,7 +975,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1029,7 +1029,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1085,7 +1085,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1096,7 +1096,7 @@
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 123,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"monorepo_builder\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
@@ -1162,7 +1162,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1226,7 +1226,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1282,7 +1282,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1308,7 +1308,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"monorepo_builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 123, \"builder\": \"monorepo_builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1342,7 +1342,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1403,7 +1403,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1461,7 +1461,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1520,7 +1520,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1581,7 +1581,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1638,7 +1638,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1692,7 +1692,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1748,7 +1748,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1759,7 +1759,7 @@
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 123,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"monorepo_builder\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
@@ -1772,7 +1772,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"monorepo_builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
+      "{\"build_info\": {\"build_id\": 123, \"builder\": \"monorepo_builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1806,7 +1806,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1863,7 +1863,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1915,7 +1915,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1971,7 +1971,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2029,7 +2029,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2092,7 +2092,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2153,7 +2153,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2213,7 +2213,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2279,7 +2279,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2341,7 +2341,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2411,7 +2411,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2473,7 +2473,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2526,7 +2526,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2536,6 +2536,13 @@
   },
   {
     "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "Identify branches"
   },
   {
@@ -2583,7 +2590,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2641,7 +2648,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2662,7 +2669,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_4/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
+      "[CLEANUP]/tmp_tmp_4/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2703,13 +2710,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
+    "name": "Ensure monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
   },
   {
     "cmd": [
@@ -2720,7 +2727,7 @@
       "/path/to/tmp/json",
       "copy",
       "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_4/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
+      "[CLEANUP]/tmp_tmp_4/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2761,7 +2768,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2821,13 +2828,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -2842,7 +2849,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_5/monorepo"
+      "[CLEANUP]/tmp_tmp_5/monorepo/123"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2883,13 +2890,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo"
+    "name": "Ensure monorepo/123"
   },
   {
     "cmd": [
@@ -2900,7 +2907,7 @@
       "/path/to/tmp/json",
       "copy",
       "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
-      "[CLEANUP]/tmp_tmp_5/monorepo"
+      "[CLEANUP]/tmp_tmp_5/monorepo/123"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2941,7 +2948,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3001,13 +3008,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to gs://flutter_archives_v2/monorepo//download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to gs://flutter_archives_v2/monorepo/123//download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -3030,7 +3037,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3056,7 +3063,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3091,7 +3098,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3122,7 +3129,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3164,7 +3171,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3201,7 +3208,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3231,7 +3238,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3269,7 +3276,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3306,7 +3313,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3330,7 +3337,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3354,7 +3361,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3378,7 +3385,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3402,7 +3409,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3429,7 +3436,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
index 73361d4..ad35944 100644
--- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -486,6 +486,13 @@
   },
   {
     "cmd": [],
+    "name": "get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "ensure goma"
   },
   {
@@ -843,7 +850,7 @@
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--ios",
       "--rbe",
-      "--gn-args=engine_version=\"81123491\"",
+      "--gn-args=engine_version=\"8945511751514863184\"",
       "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
     ],
     "env": {
@@ -892,7 +899,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --rbe --gn-args=engine_version=\"81123491\" --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
+    "name": "gn --ios --rbe --gn-args=engine_version=\"8945511751514863184\" --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
   },
   {
     "cmd": [],
@@ -2571,6 +2578,20 @@
   },
   {
     "cmd": [],
+    "name": "get buildbucket id (2)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "get buildbucket id (3)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "Identify branches"
   },
   {
@@ -2697,7 +2718,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_4/monorepo_try/flutter_infra_release/flutter/81123491/android-x86-jit-release"
+      "[CLEANUP]/tmp_tmp_4/monorepo_try/8945511751514863184/flutter_infra_release/flutter/8945511751514863184/android-x86-jit-release"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2744,7 +2765,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo_try/flutter_infra_release/flutter/81123491/android-x86-jit-release"
+    "name": "Ensure monorepo_try/8945511751514863184/flutter_infra_release/flutter/8945511751514863184/android-x86-jit-release"
   },
   {
     "cmd": [
@@ -2755,7 +2776,7 @@
       "/path/to/tmp/json",
       "copy",
       "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
-      "[CLEANUP]/tmp_tmp_4/monorepo_try/flutter_infra_release/flutter/81123491/android-x86-jit-release"
+      "[CLEANUP]/tmp_tmp_4/monorepo_try/8945511751514863184/flutter_infra_release/flutter/8945511751514863184/android-x86-jit-release"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2862,7 +2883,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_archives_v2/monorepo_try/flutter_infra_release/flutter/81123491/android-x86-jit-release/artifacts.zip",
+    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_archives_v2/monorepo_try/8945511751514863184/flutter_infra_release/flutter/8945511751514863184/android-x86-jit-release/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -2877,7 +2898,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_5/monorepo_try"
+      "[CLEANUP]/tmp_tmp_5/monorepo_try/8945511751514863184"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -2924,7 +2945,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure monorepo_try"
+    "name": "Ensure monorepo_try/8945511751514863184"
   },
   {
     "cmd": [
@@ -2935,7 +2956,7 @@
       "/path/to/tmp/json",
       "copy",
       "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
-      "[CLEANUP]/tmp_tmp_5/monorepo_try"
+      "[CLEANUP]/tmp_tmp_5/monorepo_try/8945511751514863184"
     ],
     "cwd": "[CACHE]/builder/engine/src/flutter",
     "env": {
@@ -3042,7 +3063,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to gs://flutter_archives_v2/monorepo_try//download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to gs://flutter_archives_v2/monorepo_try/8945511751514863184//download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 6f81bab..f09206e 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -181,7 +181,6 @@
 
 def Build(api, checkout, env, env_prefixes, outputs, build):
   """Builds a flavor identified as a set of gn and ninja configs."""
-
   # Mock data for tests. This is required for the archive api to expand the directory to full path
   # of files.
   api.path.mock_add_directory(
@@ -213,7 +212,7 @@
         version = env['REVISION']
         gn.append(f'--gn-args=engine_version="{version}"')
       if api.monorepo.is_monorepo_try_build:
-        version = api.monorepo.try_build_identifier
+        version = api.monorepo.build_identifier
         gn.append(f'--gn-args=engine_version="{version}"')
       rbe_working_path = api.path.mkdtemp(prefix="rbe")
       if '--rbe' in gn:
@@ -345,24 +344,37 @@
   build = {
       "archives": [{
           "name":
-              "android_jit_release_x86", "type":
-                  "gcs", "realm":
-                      "production", "base_path":
-                          "out/android_jit_release_x86/zip_archives/",
+              "android_jit_release_x86",
+          "type":
+              "gcs",
+          "realm":
+              "production",
+          "base_path":
+              "out/android_jit_release_x86/zip_archives/",
           "include_paths": [
               "out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
               "out/android_jit_release_x86/zip_archives/download.flutter.io"
           ]
-      }], "gn": ["--ios", "--rbe"],
-      "ninja": {"config": "ios_debug", "targets": []}, "generators": {
-          "pub_dirs": ["dev"], "tasks": [{
-              "name": "generator1", "scripts": ["script1.sh", "dev/felt.dart"],
+      }],
+      "gn": ["--ios", "--rbe"],
+      "ninja": {
+          "config": "ios_debug",
+          "targets": []
+      },
+      "generators": {
+          "pub_dirs": ["dev"],
+          "tasks": [{
+              "name": "generator1",
+              "scripts": ["script1.sh", "dev/felt.dart"],
               "parameters": ["--argument1"]
           }]
-      }, "tests": [{
-          "name": "mytest", "script": "myscript.sh",
+      },
+      "tests": [{
+          "name": "mytest",
+          "script": "myscript.sh",
           "parameters": ["param1", "param2", '${FLUTTER_LOGS_DIR}'],
-          "type": "local", "contexts": ["metric_center_token"]
+          "type": "local",
+          "contexts": ["metric_center_token"]
       }]
   }
   yield api.test(
@@ -461,10 +473,12 @@
   )
   test_if_build = {
       "tests": [{
-          "name": "mytest", "script": "myscript.sh",
-          "parameters": ["param1", "param2",
-                         '${FLUTTER_LOGS_DIR}'], "type": "local",
-          "contexts": ["metric_center_token"], "test_if": "main"
+          "name": "mytest",
+          "script": "myscript.sh",
+          "parameters": ["param1", "param2", '${FLUTTER_LOGS_DIR}'],
+          "type": "local",
+          "contexts": ["metric_center_token"],
+          "test_if": "main"
       }]
   }
   yield api.test(
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json
index be9af71..4c71331 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_linux.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -4,6 +4,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -24,7 +32,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -114,6 +122,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@request@          \"generators\": {@@@",
@@ -133,6 +142,7 @@
       "@@@STEP_LOG_LINE@request@              }@@@",
       "@@@STEP_LOG_LINE@request@            ]@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 6f24447..dd21dd8 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -23,6 +23,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -43,7 +51,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,6 +140,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@request@          \"generators\": {@@@",
       "@@@STEP_LOG_LINE@request@            \"tasks\": [@@@",
@@ -150,6 +159,7 @@
       "@@@STEP_LOG_LINE@request@              }@@@",
       "@@@STEP_LOG_LINE@request@            ]@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": []@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
@@ -1628,6 +1638,14 @@
   },
   {
     "cmd": [],
+    "name": "Global generators.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "Global generators.Identify branches",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -1721,7 +1739,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_3/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_3/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1736,7 +1754,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.Ensure flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket",
+    "name": "Global generators.Ensure 8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1750,7 +1768,7 @@
       "/path/to/tmp/json",
       "copy",
       "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_3/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_3/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1781,7 +1799,7 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_3/*",
-      "gs://flutter_infra_release/"
+      "gs://flutter_archives_v2/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1796,10 +1814,10 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index 66fd0aa..758f7ef 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -88,6 +88,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -108,7 +116,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -197,6 +205,7 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
       "@@@STEP_LOG_LINE@request@          \"generators\": {@@@",
       "@@@STEP_LOG_LINE@request@            \"tasks\": [@@@",
@@ -215,6 +224,7 @@
       "@@@STEP_LOG_LINE@request@              }@@@",
       "@@@STEP_LOG_LINE@request@            ]@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\",@@@",
       "@@@STEP_LOG_LINE@request@          \"tests\": []@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
@@ -1798,7 +1808,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_3/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_3/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1813,7 +1823,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.Ensure flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket",
+    "name": "Global generators.Ensure flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1827,7 +1837,7 @@
       "/path/to/tmp/json",
       "copy",
       "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_3/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_3/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1873,7 +1883,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
@@ -1915,7 +1925,7 @@
       "-digest",
       "fad0b8af5e6cfa27a7e36870911c7d0dc60d034df1e50a368882f5d34b88a6ee",
       "-gcs-uri",
-      "gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt"
+      "gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt"
     ],
     "luci_context": {
       "realm": {
diff --git a/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json b/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json
index 34f5302..579f5a4 100644
--- a/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json
+++ b/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json
@@ -19,7 +19,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -50,7 +50,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -76,7 +76,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -101,7 +101,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -130,7 +130,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -155,7 +155,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -182,7 +182,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -211,7 +211,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -253,7 +253,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -280,7 +280,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -296,6 +296,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -309,14 +317,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-a builder with gclient_variables\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {\"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/being-used\"}, \"name\": \"a builder with gclient_variables\", \"recipe\": \"engine_v2/builder\"}, \"config_name\": \"config_name\", \"gclient_variables\": {\"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/being-used\"}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-a builder with gclient_variables\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {\"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/being-used\"}, \"name\": \"a builder with gclient_variables\", \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"123\", \"config_name\": \"config_name\", \"gclient_variables\": {\"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/being-used\"}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"123-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -375,20 +383,22 @@
       "@@@STEP_LOG_LINE@request@            \"name\": \"a builder with gclient_variables\",@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {@@@",
       "@@@STEP_LOG_LINE@request@            \"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/being-used\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
@@ -431,7 +441,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -457,7 +467,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -565,7 +575,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -592,7 +602,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index a294c45..e4fc39d 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -418,6 +418,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -438,7 +446,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/None\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/None\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -528,9 +536,11 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
@@ -2105,6 +2115,14 @@
   },
   {
     "cmd": [],
+    "name": "Global generators.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "Global generators.Identify branches",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -2891,7 +2909,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_4/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_4/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -2906,7 +2924,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.Ensure flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket",
+    "name": "Global generators.Ensure 8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2920,7 +2938,7 @@
       "/path/to/tmp/json",
       "copy",
       "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_4/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_4/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -2966,7 +2984,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
diff --git a/recipes/engine_v2/engine_v2.expected/config_from_file.json b/recipes/engine_v2/engine_v2.expected/config_from_file.json
index c599b09..99489ef 100644
--- a/recipes/engine_v2/engine_v2.expected/config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -326,6 +326,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -346,7 +354,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -436,9 +444,11 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
index 8bee382..45a3528 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
@@ -19,7 +19,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -50,7 +50,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -76,7 +76,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -101,7 +101,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -130,7 +130,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -155,7 +155,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -182,7 +182,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -211,7 +211,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -276,7 +276,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -303,7 +303,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -332,7 +332,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -359,7 +359,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -375,6 +375,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -388,14 +396,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-ios_debug\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/None\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"config_name\": \"config_name\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-ios_debug\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/None\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"123\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"123-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -477,18 +485,20 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
@@ -531,7 +541,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -557,7 +567,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -665,7 +675,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -692,7 +702,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json b/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
index ef3f3e1..95e39a4 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
@@ -19,7 +19,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -50,7 +50,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -76,7 +76,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -101,7 +101,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -130,7 +130,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -155,7 +155,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -182,7 +182,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -211,7 +211,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -313,7 +313,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -340,7 +340,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -369,7 +369,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -396,7 +396,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -412,6 +412,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -425,14 +433,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-ios_debug\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/None\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"config_name\": \"config_name\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-ios_debug\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/None\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"123\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"123-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -514,18 +522,20 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
@@ -568,7 +578,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -594,7 +604,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -703,7 +713,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -741,7 +751,7 @@
       "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
       "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
       "ENGINE_PATH": "[CACHE]/builder/engine",
       "GIT_BACKENDINFO": "1",
@@ -784,7 +794,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -901,7 +911,7 @@
       "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
       "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/8945511751514863184",
+      "DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/monorepo_builder/123",
       "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
       "ENGINE_PATH": "[CACHE]/builder/engine",
       "GIT_BRANCH": "",
@@ -933,7 +943,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -961,7 +971,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1021,7 +1031,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1081,7 +1091,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1106,7 +1116,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1119,6 +1129,14 @@
   },
   {
     "cmd": [],
+    "name": "Global generators.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "Global generators.Identify branches",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -1138,7 +1156,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1165,7 +1183,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1186,7 +1204,7 @@
       "ensure-directory",
       "--mode",
       "0o777",
-      "[CLEANUP]/tmp_tmp_2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1195,13 +1213,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.Ensure monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket",
+    "name": "Global generators.Ensure monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1215,7 +1233,7 @@
       "/path/to/tmp/json",
       "copy",
       "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1224,7 +1242,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1255,13 +1273,13 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
-    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+    "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/monorepo/123/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
@@ -1272,6 +1290,14 @@
     "name": "launch tests"
   },
   {
+    "cmd": [],
+    "name": "launch tests.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -1285,14 +1311,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch tests.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-None-framework_tests libraries\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"name\": \"framework_tests libraries\", \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [], \"shard\": \"framework_tests\", \"subshard\": \"libraries\", \"test_dependencies\": [{\"dependency\": \"android_sdk\", \"version\": \"version:33v6\"}]}, \"config_name\": \"config_name\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/tester\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-None-framework_tests libraries\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"name\": \"framework_tests libraries\", \"parent_commit\": \"deadbeef\", \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [], \"shard\": \"framework_tests\", \"subshard\": \"libraries\", \"test_dependencies\": [{\"dependency\": \"android_sdk\", \"version\": \"version:33v6\"}]}, \"build_identifier\": \"123\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"parent_commit\": \"deadbeef\", \"recipe\": \"engine_v2/tester\"}, \"requestId\": \"123-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1337,6 +1363,7 @@
       "@@@STEP_LOG_LINE@request@        \"properties\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"build\": {@@@",
       "@@@STEP_LOG_LINE@request@            \"name\": \"framework_tests libraries\",@@@",
+      "@@@STEP_LOG_LINE@request@            \"parent_commit\": \"deadbeef\",@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/tester\",@@@",
       "@@@STEP_LOG_LINE@request@            \"resolved_deps\": [],@@@",
       "@@@STEP_LOG_LINE@request@            \"shard\": \"framework_tests\",@@@",
@@ -1348,18 +1375,20 @@
       "@@@STEP_LOG_LINE@request@              }@@@",
       "@@@STEP_LOG_LINE@request@            ]@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"deadbeef\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/tester\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-00000000133a\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
@@ -1402,7 +1431,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1428,7 +1457,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_try.json b/recipes/engine_v2/engine_v2.expected/monorepo_try.json
index 59fa12b..7e51b87 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_try.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_try.json
@@ -32,7 +32,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try.monorepo\", \"builder\": \"flutter-linux-ios_debug-try\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"9425\", \"host\": \"dart-review.googlesource.com\", \"patchset\": \"3\", \"project\": \"sdk\"}], \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"builder_name_suffix\": \"-try\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/builder\", \"try_build_identifier\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try.monorepo\", \"builder\": \"flutter-linux-ios_debug-try\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"9425\", \"host\": \"dart-review.googlesource.com\", \"patchset\": \"3\", \"project\": \"sdk\"}], \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"builder_name_suffix\": \"-try\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -116,10 +116,11 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"builder_name_suffix\": \"-try\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
-      "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"try_build_identifier\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
diff --git a/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json b/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
index 3b01208..4c6162c 100644
--- a/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
+++ b/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
@@ -19,7 +19,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -50,7 +50,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -76,7 +76,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -101,7 +101,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -130,7 +130,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -155,7 +155,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -182,7 +182,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -211,7 +211,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -253,7 +253,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -280,7 +280,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -296,6 +296,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@123@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -309,14 +317,14 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-a builder with gclient_variables\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {\"download_fuchsia_sdk\": true, \"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/123\"}, \"name\": \"a builder with gclient_variables\", \"recipe\": \"engine_v2/builder\"}, \"config_name\": \"config_name\", \"gclient_variables\": {\"download_fuchsia_sdk\": true, \"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/123\"}, \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"flutter-linux-a builder with gclient_variables\", \"project\": \"dart\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {\"download_fuchsia_sdk\": true, \"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/123\"}, \"name\": \"a builder with gclient_variables\", \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"123\", \"config_name\": \"config_name\", \"gclient_variables\": {\"download_fuchsia_sdk\": true, \"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/123\"}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"123-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"123\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -376,21 +384,23 @@
       "@@@STEP_LOG_LINE@request@            \"name\": \"a builder with gclient_variables\",@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"123\",@@@",
       "@@@STEP_LOG_LINE@request@          \"config_name\": \"config_name\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {@@@",
       "@@@STEP_LOG_LINE@request@            \"download_fuchsia_sdk\": true,@@@",
       "@@@STEP_LOG_LINE@request@            \"fuchsia_sdk_path\": \"gcs://fuchsia/sdk/123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine_v2/builder\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
+      "@@@STEP_LOG_LINE@request@        \"requestId\": \"123-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"value\": \"123\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
       "@@@STEP_LOG_LINE@request@          {@@@",
       "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
@@ -433,7 +443,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -459,7 +469,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -567,7 +577,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -594,7 +604,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/engine_v2.py b/recipes/engine_v2/engine_v2.py
index 0b32f6c..c8fda35 100644
--- a/recipes/engine_v2/engine_v2.py
+++ b/recipes/engine_v2/engine_v2.py
@@ -63,7 +63,7 @@
     # Only check out the repository, not dependencies.
     api.flutter_bcid.report_stage(BcidStage.FETCH.value)
     checkout_path = api.path['start_dir'].join(project)
-    api.repo_util.checkout(
+    parent_commit = api.repo_util.checkout(
         project,
         checkout_path=checkout_path,
         url=api.properties.get('git_url'),
@@ -94,7 +94,8 @@
   if gclient_variables:
     for build in builds:
       build['gclient_variables'] = {
-          **gclient_variables, **build.get('gclient_variables', {})
+          **gclient_variables,
+          **build.get('gclient_variables', {})
       }
 
   current_branch = 'main'
@@ -166,6 +167,8 @@
   # Run tests
   if not api.flutter_bcid.is_official_build():
     with api.step.nest('launch tests') as presentation:
+      for d in tests:
+        d['parent_commit'] = parent_commit
       tasks = api.shard_util.schedule_tests(tests, build_results, presentation)
 
     with api.step.nest('collect tests') as presentation:
@@ -267,30 +270,44 @@
   )
   builds = [{
       "archives": [{
-          "base_path": "out/host_debug/zip_archives/", "type": "gcs",
+          "base_path": "out/host_debug/zip_archives/",
+          "type": "gcs",
           "include_paths": [
               "out/host_debug/zip_archives/darwin-x64/artifacts.zip",
               "out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
               "out/host_debug/zip_archives/dart-sdk-darwin-x64.zip",
               "out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip"
-          ], "name": "host_debug"
-      }], "name": "ios_debug", "gn": ["--ios"],
-      "ninja": {"config": "ios_debug", "targets": []},
-      "generators": [{"name": "generator1", "script": "script1.sh"}],
+          ],
+          "name": "host_debug"
+      }],
+      "name": "ios_debug",
+      "gn": ["--ios"],
+      "ninja": {
+          "config": "ios_debug",
+          "targets": []
+      },
+      "generators": [{
+          "name": "generator1",
+          "script": "script1.sh"
+      }],
       "drone_dimensions": ['os=Linux']
   }]
   generators = {
       "tasks": [{
-          "language": "python3", "name": "Debug-FlutterMacOS.framework",
+          "language": "python3",
+          "name": "Debug-FlutterMacOS.framework",
           "parameters": [
               "--variant", "host_profile", "--type", "engine",
               "--engine-capture-core-dump"
-          ], "script": "flutter/sky/tools/create_macos_framework.py",
+          ],
+          "script": "flutter/sky/tools/create_macos_framework.py",
           "type": "local"
       }]
   }
   archives = [{
-      'source': '/a/b/c.txt', 'destination': 'bucket/c.txt', 'name': 'c.txt'
+      'source': '/a/b/c.txt',
+      'destination': 'bucket/c.txt',
+      'name': 'c.txt'
   }]
 
   yield api.test(
@@ -388,7 +405,10 @@
       ),
       api.step_data(
           'Read build config file',
-          api.file.read_json({'builds': builds, 'archives': archives})
+          api.file.read_json({
+              'builds': builds,
+              'archives': archives
+          })
       ),
   )
 
@@ -461,7 +481,9 @@
       api.step_data(
           'Read build config file',
           api.file.read_json({
-              'builds': builds, 'archives': archives, 'generators': generators
+              'builds': builds,
+              'archives': archives,
+              'generators': generators
           })
       ),
       api.step_data(
@@ -485,11 +507,15 @@
 
   tests = [{
       "name":
-          "framework_tests libraries", "shard":
-              "framework_tests", "subshard":
-                  "libraries", "test_dependencies": [{
-                      "dependency": "android_sdk", "version": "version:33v6"
-                  }]
+          "framework_tests libraries",
+      "shard":
+          "framework_tests",
+      "subshard":
+          "libraries",
+      "test_dependencies": [{
+          "dependency": "android_sdk",
+          "version": "version:33v6"
+      }]
   }]
 
   subtest1 = api.shard_util.try_build_message(
@@ -517,7 +543,9 @@
       api.step_data(
           'Read build config file',
           api.file.read_json({
-              'builds': builds, 'tests': tests, 'generators': generators,
+              'builds': builds,
+              'tests': tests,
+              'generators': generators,
               'archives': archives
           })
       ),
@@ -547,7 +575,8 @@
           api.file.read_json({
               'builds': [{
                   'name': 'a builder with gclient_variables',
-                  'drone_dimensions': ['os=Linux'], 'gclient_variables': {
+                  'drone_dimensions': ['os=Linux'],
+                  'gclient_variables': {
                       'fuchsia_sdk_path': 'gcs://fuchsia/sdk/123'
                   }
               }]
@@ -575,7 +604,8 @@
           api.file.read_json({
               'builds': [{
                   'name': 'a builder with gclient_variables',
-                  'drone_dimensions': ['os=Linux'], 'gclient_variables': {
+                  'drone_dimensions': ['os=Linux'],
+                  'gclient_variables': {
                       'fuchsia_sdk_path': 'gcs://fuchsia/sdk/being-used'
                   }
               }]
diff --git a/recipes/engine_v2/tester.expected/engine.json b/recipes/engine_v2/tester.expected/engine.json
index 4185f6e..754e027 100644
--- a/recipes/engine_v2/tester.expected/engine.json
+++ b/recipes/engine_v2/tester.expected/engine.json
@@ -226,7 +226,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\n",
+      "12345\n",
       "[CACHE]/builder/flutter/bin/internal/engine.version"
     ],
     "infra_step": true,
@@ -244,12 +244,162 @@
     },
     "name": "update engine version",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@engine.version@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd@@@",
+      "@@@STEP_LOG_LINE@engine.version@12345@@@",
       "@@@STEP_LOG_END@engine.version@@@"
     ]
   },
   {
     "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[CACHE]/builder/flutter/bin/internal/material_fonts.version",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read material fonts version",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@material_fonts.version@flutter_infra_release/flutter/fonts/12345/fonts.version@@@",
+      "@@@STEP_LOG_END@material_fonts.version@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "gs://flutter_infra_release/flutter/fonts/12345/fonts.version",
+      "gs://flutter_archives_v2/81123491/flutter_infra_release/flutter/fonts/12345/fonts.version"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil copy Material fonts",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/flutter_archives_v2/81123491/flutter_infra_release/flutter/fonts/12345/fonts.version@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[CACHE]/builder/flutter/bin/internal/gradle_wrapper.version",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read graddle wrapper version",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@gradle_wrapper.version@flutter_infra_release/gradle-wrapper/12345/gradle-wrapper.tgz@@@",
+      "@@@STEP_LOG_END@gradle_wrapper.version@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "gs://flutter_infra_release/gradle-wrapper/12345/gradle-wrapper.tgz",
+      "gs://flutter_archives_v2/81123491/flutter_infra_release/gradle-wrapper/12345/gradle-wrapper.tgz"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil copy Gradle wrapper",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/flutter_archives_v2/81123491/flutter_infra_release/gradle-wrapper/12345/gradle-wrapper.tgz@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "gs://flutter_infra_release/flutter/coverage/lcov.info",
+      "gs://flutter_archives_v2/81123491/flutter_infra_release/flutter/coverage/lcov.info"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil copy lcov.info",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/flutter_archives_v2/81123491/flutter_infra_release/flutter/coverage/lcov.info@@@"
+    ]
+  },
+  {
+    "cmd": [
       "git",
       "rev-parse",
       "HEAD"
@@ -272,26 +422,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/flutter/bin/flutter",
-      "config",
-      "--clear-features"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter config --clear-features"
-  },
-  {
-    "cmd": [
       "flutter",
       "update-packages",
       "-v"
@@ -300,7 +430,7 @@
     "env": {
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2",
+      "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/81123491",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
@@ -342,7 +472,7 @@
     "env": {
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2",
+      "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/81123491",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
diff --git a/recipes/engine_v2/tester.expected/monorepo.json b/recipes/engine_v2/tester.expected/monorepo.json
index f8c0371..6c98990 100644
--- a/recipes/engine_v2/tester.expected/monorepo.json
+++ b/recipes/engine_v2/tester.expected/monorepo.json
@@ -15,7 +15,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -43,7 +43,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -74,7 +74,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -100,7 +100,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,7 +125,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -154,7 +154,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -179,7 +179,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -206,7 +206,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -235,7 +235,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -271,7 +271,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -302,7 +302,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -328,7 +328,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -353,7 +353,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -382,7 +382,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -407,7 +407,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -434,7 +434,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -463,7 +463,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -489,7 +489,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -532,7 +532,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -573,7 +573,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -598,7 +598,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -622,7 +622,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -646,7 +646,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -670,7 +670,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -694,7 +694,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -721,7 +721,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
index 4912f55..ad7df77 100644
--- a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
+++ b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
@@ -15,7 +15,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -43,7 +43,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -74,7 +74,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -100,7 +100,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,7 +125,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -154,7 +154,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -179,7 +179,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -206,7 +206,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -235,7 +235,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -271,7 +271,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -302,7 +302,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -328,7 +328,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -353,7 +353,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -382,7 +382,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -407,7 +407,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -434,7 +434,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -463,7 +463,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -489,7 +489,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -516,7 +516,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -555,7 +555,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -608,7 +608,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -656,7 +656,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -681,7 +681,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -705,7 +705,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -729,7 +729,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -753,7 +753,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -777,7 +777,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -804,7 +804,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/tester.expected/monorepo_web_tests.json b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
index e54ddf9..1416a1a 100644
--- a/recipes/engine_v2/tester.expected/monorepo_web_tests.json
+++ b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
@@ -15,7 +15,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -43,7 +43,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -74,7 +74,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -100,7 +100,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -125,7 +125,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -154,7 +154,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -179,7 +179,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -206,7 +206,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -235,7 +235,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -271,7 +271,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -302,7 +302,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -328,7 +328,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -353,7 +353,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -382,7 +382,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -407,7 +407,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -434,7 +434,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -463,7 +463,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -489,7 +489,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -520,7 +520,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -561,7 +561,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -622,7 +622,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -667,7 +667,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -692,7 +692,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -716,7 +716,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -740,7 +740,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -764,7 +764,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -788,7 +788,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -815,7 +815,7 @@
       },
       "resultdb": {
         "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
+          "name": "invocations/build:123",
           "update_token": "token"
         },
         "hostname": "rdbhost"
diff --git a/recipes/engine_v2/tester.py b/recipes/engine_v2/tester.py
index beef710..0f6b5ed 100644
--- a/recipes/engine_v2/tester.py
+++ b/recipes/engine_v2/tester.py
@@ -8,6 +8,7 @@
 """
 
 DEPS = [
+    'depot_tools/gsutil',
     'flutter/flutter_deps',
     'flutter/monorepo',
     'flutter/os_utils',
@@ -41,6 +42,47 @@
   return commits['flutter']
 
 
+def _upload_artifact(api, name, src, artifact_url):
+  # The artifact_url is a gsutil url, e.g.
+  # gs://flutter_archive_v2/523b61/flutter_infra_release/flutter/fonts/bec8d8/fonts.zip
+  dst = artifact_url.replace('https://storage.googleapis.com/', '')
+  bucket = dst.split('/')[0]
+  path = '/'.join(dst.split('/')[1:])
+  api.gsutil.upload(
+      name='copy %s' % name,
+      source='gs://%s' % src,
+      bucket=bucket,
+      dest='%s/%s' % (path, src)
+  )
+
+
+def copy_offband_artifacts(api, checkout, artifact_url):
+  # Noop for monorepo.
+  if '/monorepo' in artifact_url:
+    return
+  # fonts.zip
+  src = api.file.read_text(
+      'read material fonts version',
+      checkout.join('bin', 'internal', 'material_fonts.version'),
+      test_data='flutter_infra_release/flutter/fonts/12345/fonts.version',
+      include_log=True
+  )
+  _upload_artifact(api, 'Material fonts', src, artifact_url)
+  # Gradle wrapper
+  src = api.file.read_text(
+      'read graddle wrapper version',
+      checkout.join('bin', 'internal', 'gradle_wrapper.version'),
+      test_data='flutter_infra_release/gradle-wrapper/12345/gradle-wrapper.tgz',
+      include_log=True
+  )
+  _upload_artifact(api, 'Gradle wrapper', src, artifact_url)
+  # lcov.info
+  _upload_artifact(
+      api, 'lcov.info', 'flutter_infra_release/flutter/coverage/lcov.info',
+      artifact_url
+  )
+
+
 def RunSteps(api):
   # Collect memory/cpu/process before task execution.
   api.os_utils.collect_os_info()
@@ -49,25 +91,30 @@
   if api.monorepo.is_monorepo_try_build:
     framework_ref = 'refs/heads/main'
     artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/monorepo_try'
-    engine_version = api.monorepo.try_build_identifier
+    engine_version = api.monorepo.build_identifier
   elif api.monorepo.is_monorepo_ci_build:
     framework_ref = get_monorepo_framework(api)
     artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/monorepo'
     engine_version = api.buildbucket.gitiles_commit.id
   else:
     framework_ref = 'refs/heads/master'
-    artifact_url = 'https://storage.googleapis.com/flutter_archives_v2'
-    engine_version = api.buildbucket.gitiles_commit.id
+    artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/%s' % api.monorepo.build_identifier
+    engine_version = api.properties.get('parent_commit')
   api.repo_util.checkout('flutter', flutter, ref=framework_ref)
   api.file.write_text(
       'update engine version',
       flutter.join('bin', 'internal', 'engine.version'), engine_version + '\n'
   )
 
+  # Copy offband artifacts. This is a noop for monorepo.
+  copy_offband_artifacts(api, flutter, artifact_url)
+
   # TODO(https://github.com/flutter/flutter/issues/116906): Combine this
   # recipe with the flutter/flutter_drone recipe if possible, to avoid
   # duplication.
-  env, env_prefixes = api.repo_util.flutter_environment(flutter)
+  env, env_prefixes = api.repo_util.flutter_environment(
+      flutter, clear_features=False
+  )
   test_config = api.properties.get('build')
   deps = test_config.get('test_dependencies', [])
   api.flutter_deps.required_deps(env, env_prefixes, deps)
@@ -111,15 +158,18 @@
 
   yield api.test(
       'monorepo_tryjob',
-      api.properties(
-          build=build, no_goma=True, try_build_identifier='81123491'
-      ),
+      api.properties(build=build, no_goma=True, build_identifier='81123491'),
       api.monorepo.try_build(),
   )
 
   yield api.test(
       'engine',
-      api.properties(build=build, no_goma=True),
+      api.properties(
+          build=build,
+          no_goma=True,
+          parent_commit='12345',
+          build_identifier='81123491'
+      ),
       api.buildbucket.ci_build(
           project='flutter',
           bucket='prod',
@@ -137,7 +187,8 @@
       'subshard':
           '3',
       'test_dependencies': [{
-          "dependency": "chrome_and_driver", "version": "version:96.2"
+          "dependency": "chrome_and_driver",
+          "version": "version:96.2"
       }],
   }
 
@@ -157,7 +208,8 @@
       'subshard':
           'slow',
       'test_dependencies': [{
-          "dependency": "android_sdk", "version": "version:33v6"
+          "dependency": "android_sdk",
+          "version": "version:33v6"
       }],
   }
 
diff --git a/recipes/release/release_builder.expected/basic_linux_beta.json b/recipes/release/release_builder.expected/basic_linux_beta.json
index 150b489..0606a5e 100644
--- a/recipes/release/release_builder.expected/basic_linux_beta.json
+++ b/recipes/release/release_builder.expected/basic_linux_beta.json
@@ -374,6 +374,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -394,7 +402,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"release/something\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -471,8 +479,10 @@
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"release/something\",@@@",
       "@@@STEP_LOG_LINE@request@            \"scheduler\": \"release\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"release/something\",@@@",
       "@@@STEP_LOG_LINE@request@          \"repository\": \"engine\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
diff --git a/recipes/release/release_builder.expected/basic_linux_main.json b/recipes/release/release_builder.expected/basic_linux_main.json
index 501c3ef..a34d946 100644
--- a/recipes/release/release_builder.expected/basic_linux_main.json
+++ b/recipes/release/release_builder.expected/basic_linux_main.json
@@ -375,6 +375,14 @@
     "name": "launch builds"
   },
   {
+    "cmd": [],
+    "name": "launch builds.get buildbucket id",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@8945511751514863184@@@"
+    ]
+  },
+  {
     "cmd": [
       "bb",
       "batch",
@@ -395,7 +403,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": true}, \"recipe\": \"engine/something\"}, \"environment\": \"Staging\", \"gclient_variables\": {}, \"recipe\": \"engine/something\", \"release_build\": true, \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": true}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": true, \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -468,8 +476,10 @@
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine/something\"@@@",
       "@@@STEP_LOG_LINE@request@          },@@@",
+      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine/something\",@@@",
       "@@@STEP_LOG_LINE@request@          \"release_build\": true,@@@",
       "@@@STEP_LOG_LINE@request@          \"repository\": \"engine\"@@@",