formatted sub-build url name as `{build.builder.builder} - {build.number}`

Bug: https://github.com/flutter/flutter/issues/168984

Change-Id: I504b4bb1e08413ab1111659c00601d3940e2cf87
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/69045
Commit-Queue: Matan Lurey <matanl@google.com>
Reviewed-by: Matan Lurey <matanl@google.com>
Commit-Queue: Dmitry Grand <dmgr@google.com>
diff --git a/recipe_modules/shard_util/api.py b/recipe_modules/shard_util/api.py
index 29071ad..fe24f3a 100644
--- a/recipe_modules/shard_util/api.py
+++ b/recipe_modules/shard_util/api.py
@@ -418,7 +418,7 @@
     scheduled_builds = self.m.buildbucket.schedule(
       reqs,
       step_name="schedule",
-      url_title_fn=lambda build: build.builder.builder,
+      url_title_fn=lambda build: f"{build.builder.builder} - {build.number}",
     )
     results = {}
     for build, task_name in zip(scheduled_builds, task_names):
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 145479b..14a2efb 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
@@ -153,7 +153,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@ios_debug@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@ios_debug - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
@@ -632,7 +632,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@flutter-None-felt_test@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@flutter-None-felt_test - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
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 17ba5e5..86edf4a 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
@@ -159,7 +159,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@ios_debug@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@ios_debug - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
@@ -644,7 +644,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@flutter-None-felt_test-try@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@flutter-None-felt_test-try - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
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 2353f7a..347295c 100644
--- a/recipe_modules/shard_util/examples/full.expected/presubmit_bb.json
+++ b/recipe_modules/shard_util/examples/full.expected/presubmit_bb.json
@@ -157,7 +157,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild2@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
+      "@@@STEP_LINK@builder-subbuild2 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
     ]
   },
   {
diff --git a/recipe_modules/shard_util/examples/full.expected/presubmit_bb_release.json b/recipe_modules/shard_util/examples/full.expected/presubmit_bb_release.json
index 482aa57..0fc52c4 100644
--- a/recipe_modules/shard_util/examples/full.expected/presubmit_bb_release.json
+++ b/recipe_modules/shard_util/examples/full.expected/presubmit_bb_release.json
@@ -157,7 +157,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild2@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
+      "@@@STEP_LINK@builder-subbuild2 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
     ]
   },
   {
diff --git a/recipe_modules/shard_util/examples/full.expected/presubmit_bb_with_custom_timeout.json b/recipe_modules/shard_util/examples/full.expected/presubmit_bb_with_custom_timeout.json
index 6efafad..b99ba8d 100644
--- a/recipe_modules/shard_util/examples/full.expected/presubmit_bb_with_custom_timeout.json
+++ b/recipe_modules/shard_util/examples/full.expected/presubmit_bb_with_custom_timeout.json
@@ -155,7 +155,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild2@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
+      "@@@STEP_LINK@builder-subbuild2 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
     ]
   },
   {
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 fe6df5a..65fa9f0 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
@@ -1026,7 +1026,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
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 4a6c2cc..e567335 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
@@ -132,7 +132,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
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 75f3bd9..6fda80e 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
@@ -1217,7 +1217,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
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 93c2a61..83f529d 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -2867,7 +2867,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Mac Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Mac Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json
index b3880d2..d1c6944 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_linux.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -168,7 +168,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 936c1f8..ceddaa1 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -182,7 +182,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 c42a725..9cd3da8 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
@@ -248,7 +248,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json b/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json
index 8bb4544..e4e1ac5 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json
@@ -407,7 +407,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_try.json b/recipes/engine_v2/engine_v2.expected/basic_mac_try.json
index 4fee9a2..4676491 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_try.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_try.json
@@ -182,7 +182,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 caa9f18..dd42f85 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
@@ -354,7 +354,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 1f14f10..1e516d6 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -485,7 +485,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 1e0219e..4d69168 100644
--- a/recipes/engine_v2/engine_v2.expected/config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -418,7 +418,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/content_hash.json b/recipes/engine_v2/engine_v2.expected/content_hash.json
index 5498859..04897a0 100644
--- a/recipes/engine_v2/engine_v2.expected/content_hash.json
+++ b/recipes/engine_v2/engine_v2.expected/content_hash.json
@@ -166,7 +166,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/content_hash_missing.json b/recipes/engine_v2/engine_v2.expected/content_hash_missing.json
index c3b96a9..231ebff 100644
--- a/recipes/engine_v2/engine_v2.expected/content_hash_missing.json
+++ b/recipes/engine_v2/engine_v2.expected/content_hash_missing.json
@@ -165,7 +165,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/do_not_codesign_release_branch_on_try_bot.json b/recipes/engine_v2/engine_v2.expected/do_not_codesign_release_branch_on_try_bot.json
index 9a8eed8..eab5a9f 100644
--- a/recipes/engine_v2/engine_v2.expected/do_not_codesign_release_branch_on_try_bot.json
+++ b/recipes/engine_v2/engine_v2.expected/do_not_codesign_release_branch_on_try_bot.json
@@ -485,7 +485,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 ec9b6dc..c36e931 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
@@ -398,7 +398,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 647f416..2e5325d 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
@@ -435,7 +435,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
@@ -1227,7 +1227,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@subtest1@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
+      "@@@STEP_LINK@subtest1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_try.json b/recipes/engine_v2/engine_v2.expected/monorepo_try.json
index 37c2b9c..dd1f30c 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_try.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_try.json
@@ -145,7 +145,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
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 75ffbf8..e829a46 100644
--- a/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
+++ b/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
@@ -356,7 +356,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
index d406be8..a341598 100644
--- a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
@@ -814,7 +814,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/base_linux_main_monorepo.json b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
index 3653b53..3c530f2 100644
--- a/recipes/release/release_builder.expected/base_linux_main_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
@@ -811,7 +811,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
@@ -954,7 +954,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json b/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
index a81dbbd..3b816e1 100644
--- a/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
+++ b/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
@@ -829,7 +829,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
@@ -967,7 +967,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/filter_enabled_branches.json b/recipes/release/release_builder.expected/filter_enabled_branches.json
index 6e76e2e..fc8bf6f 100644
--- a/recipes/release/release_builder.expected/filter_enabled_branches.json
+++ b/recipes/release/release_builder.expected/filter_enabled_branches.json
@@ -810,7 +810,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
@@ -954,7 +954,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Mac Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Mac Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json b/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
index af22ef5..32b59c0 100644
--- a/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
+++ b/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
@@ -829,7 +829,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
@@ -967,7 +967,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json b/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
index 748dcd1..faaf566 100644
--- a/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
+++ b/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
@@ -929,7 +929,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json b/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
index 0a2dce8..cce22bc 100644
--- a/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
+++ b/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
@@ -898,7 +898,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json b/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
index 18c2b7f..606c2d0 100644
--- a/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
+++ b/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
@@ -933,7 +933,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Production Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Production Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
@@ -1077,7 +1077,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Mac Production Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Mac Production Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/linux_schedule_during_release_override.json b/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
index 69e6652..6f2b8ff 100644
--- a/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
+++ b/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
@@ -810,7 +810,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
@@ -954,7 +954,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Mac Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Mac Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
@@ -1307,7 +1307,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/linux_scheduler_release.json b/recipes/release/release_builder.expected/linux_scheduler_release.json
index 8b6ab21..3a8584e 100644
--- a/recipes/release/release_builder.expected/linux_scheduler_release.json
+++ b/recipes/release/release_builder.expected/linux_scheduler_release.json
@@ -810,7 +810,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
@@ -954,7 +954,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Mac Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Mac Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
@@ -1307,7 +1307,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json b/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
index 018b71d..d84cd59 100644
--- a/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
+++ b/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
@@ -814,7 +814,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json b/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
index e324bd4..d4bcbe7 100644
--- a/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
+++ b/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
@@ -889,7 +889,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json b/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json
index 1c9af2d..3701bae 100644
--- a/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json
+++ b/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json
@@ -822,7 +822,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Linux Production Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
+      "@@@STEP_LINK@Linux Production Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@"
     ]
   },
   {
@@ -966,7 +966,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@Mac Production Engine Drone@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
+      "@@@STEP_LINK@Mac Production Engine Drone - 0@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@"
     ]
   },
   {
diff --git a/recipes/release/release_builder.expected/windows_scheduler_release.json b/recipes/release/release_builder.expected/windows_scheduler_release.json
index a71fedc..7821c90 100644
--- a/recipes/release/release_builder.expected/windows_scheduler_release.json
+++ b/recipes/release/release_builder.expected/windows_scheduler_release.json
@@ -776,7 +776,7 @@
       "@@@STEP_LOG_LINE@request@  ]@@@",
       "@@@STEP_LOG_LINE@request@}@@@",
       "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@builder-subbuild1@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
+      "@@@STEP_LINK@builder-subbuild1 - 0@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
     ]
   },
   {