Google Git
Sign in
flutter/recipes/37af5309555e54eeb627a02292a3ffcb51efae6d^!/.
commit
37af5309555e54eeb627a02292a3ffcb51efae6d
[log]
author
Godofredo Contreras <godofredoc@google.com>
Thu Mar 02 02:30:11 2023 +0000
committer
CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com>
Thu Mar 02 02:30:11 2023 +0000
tree
94f98e077a042acf2c2330a2ba5a19b26799e81e
parent
7c57c8024320ea88b0b1b0e4b78f94116274e1ba [diff]
Reland "Make global generator uploads consistent with the archive api."

This is a reland of commit 3a4aed2d37deebedcdd262be27b72e2a5b93162c

Original change's description:
> Make global generator uploads consistent with the archive api.
>
> Engine_v2 recipe was implementing its own upload logic with hardcoded
> paths.
>
> This is also fixing some small issues with the step names when uploading
> files to GCS.
>
> Bug: https://github.com/flutter/flutter/issues/121660
> Change-Id: Ia9d41a3dc0426333bcb79a094e40ab66645b3636
> Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/39760
> Commit-Queue: Godofredo Contreras <godofredoc@google.com>
> Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
> Reviewed-by: William Hesse <whesse@google.com>
> Reviewed-by: Ricardo Amador <ricardoamador@google.com>

Bug: https://github.com/flutter/flutter/issues/121660
Change-Id: I48b750fa4ecffe08b108c379abeafd249f7b098f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/39762
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Reviewed-by: Ricardo Amador <ricardoamador@google.com>

diff --git a/recipe_modules/adhoc_validation/examples/full.expected/docs.json b/recipe_modules/adhoc_validation/examples/full.expected/docs.json
index f5e39a0..2f45b64 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/docs.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/docs.json

@@ -472,7 +472,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Docs.Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip",
+    "name": "Docs.Copy [START_DIR]/flutter sdk/dev/docs/api_docs.zip to tmp location",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -520,7 +520,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Docs.gsutil flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip",
+    "name": "Docs.gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"

diff --git a/recipe_modules/adhoc_validation/examples/full.expected/linux.json b/recipe_modules/adhoc_validation/examples/full.expected/linux.json
index c55128e..da80679 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/linux.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/linux.json

@@ -236,7 +236,7 @@
       ]
     },
     "infra_step": true,
-    "name": "Docs.Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip",
+    "name": "Docs.Copy [START_DIR]/flutter sdk/dev/docs/api_docs.zip to tmp location",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -272,7 +272,7 @@
       ]
     },
     "infra_step": true,
-    "name": "Docs.gsutil flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip",
+    "name": "Docs.gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"

diff --git a/recipe_modules/archives/api.py b/recipe_modules/archives/api.py
index dab85a3..2aeddfc 100644
--- a/recipe_modules/archives/api.py
+++ b/recipe_modules/archives/api.py

@@ -38,20 +38,20 @@
 
 # Bucket + initial prefix for artifact destination.
 LUCI_TO_GCS_PREFIX = {
-    'flutter': 'flutter_infra_release/',
-    MONOREPO: 'flutter_archives_v2/monorepo/flutter_infra_release/',
-    'prod': 'flutter_infra_release/',
-    'staging': 'flutter_archives_v2/flutter_infra_release/',
-    'try': 'flutter_archives_v2/flutter_infra_release/'
+    'flutter': 'flutter_infra_release',
+    MONOREPO: 'flutter_archives_v2/monorepo/flutter_infra_release',
+    'prod': 'flutter_infra_release',
+    'staging': 'flutter_archives_v2/flutter_infra_release',
+    'try': 'flutter_archives_v2/flutter_infra_release'
 }
 
 # Bucket + initial prefix for artifact destination.
 LUCI_TO_ANDROID_GCS_PREFIX = {
     'flutter': '',
-    MONOREPO: 'flutter_archives_v2/monorepo/',
+    MONOREPO: 'flutter_archives_v2/monorepo',
     'prod': '',
-    'staging': 'flutter_archives_v2/',
-    'try': 'flutter_archives_v2/'
+    'staging': 'flutter_archives_v2',
+    'try': 'flutter_archives_v2'
 }
 
 # Subpath for realms. A realm is used to separate file destinations
@@ -129,13 +129,13 @@
     archive_dir = self.m.path.mkdtemp()
     local_dst_tree = archive_dir.join(*dir_part.split('/'))
     self.m.file.ensure_directory('Ensure %s' % dir_part, local_dst_tree)
-    self.m.file.copy('Copy %s' % dst, src, local_dst_tree)
+    self.m.file.copy('Copy %s to tmp location' % src, src, local_dst_tree)
     self.m.gsutil.upload(
+        name='Upload %s to gs://%s' % ('%s/*' % archive_dir, bucket),
         source='%s/*' % archive_dir,
         bucket=bucket,
         dest='',
         args=['-r'],
-        name=path,
         metadata=metadata,
     )
 
@@ -201,14 +201,50 @@
         )
         artifact_path = artifact_path.replace(old_location, new_location)
         bucket_and_prefix = LUCI_TO_ANDROID_GCS_PREFIX.get(bucket)
+        artifact_path = '/'.join(filter(bool, [bucket_and_prefix, artifact_path]))
       else:
         bucket_and_prefix = LUCI_TO_GCS_PREFIX.get(bucket)
-        artifact_path = '/'.join(filter(bool, ['flutter', artifact_realm, commit, rel_path, base_name]))
+        artifact_path = '/'.join(filter(bool, [bucket_and_prefix, 'flutter', artifact_realm, commit, rel_path, base_name]))
 
       results.append(
           ArchivePaths(
               include_path,
-              'gs://%s%s' % (bucket_and_prefix, artifact_path)
+              'gs://%s' % artifact_path
           )
       )
     return results
+
+  def global_generator_paths(self, checkout, archives):
+    """Calculates the global generator paths for an archive config.
+
+    Args:
+      checkout: (Path) the engine repository checkout folder.
+      archives: (list) list of dictionaries source and destination path
+        of files relative to the gclient checkout.
+
+    Returns:
+      A list of ArchivePaths with expected local and remote locations for the
+      generated artifacts.
+    """
+    results = []
+
+    # Do not archive if the build is a try build or has no input commit
+    if (self.m.buildbucket.build.input.gerrit_changes or
+        not self.m.buildbucket.gitiles_commit.project):
+      return results
+
+    # Calculate prefix and commit.
+    is_monorepo = self.m.buildbucket.gitiles_commit.project == MONOREPO
+    bucket = MONOREPO if is_monorepo else self.m.buildbucket.build.builder.bucket
+    if is_monorepo:
+      commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
+    else:
+      commit = self.m.repo_util.get_commit(checkout.join('flutter'))
+    bucket_and_prefix = LUCI_TO_GCS_PREFIX.get(bucket)
+
+    for archive in archives:
+      source = checkout.join(archive.get('source'))
+      artifact_path = '/'.join(filter(bool, [bucket_and_prefix, 'flutter', commit, archive.get('destination')]))
+      dst = 'gs://%s' % artifact_path
+      results.append(ArchivePaths(self.m.path.abspath(source), dst))
+    return results

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 060c036..b81ce88 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json
index 55d5627..bab7f9f 100644
--- a/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipe_modules/archives/examples/full.expected/monorepo_ci.json b/recipe_modules/archives/examples/full.expected/monorepo_ci.json
index 4902b58..ec34f42 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_ci.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_ci.json

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

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 9c6baae..45fb296 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

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 8ea5b54..b451ef1 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

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 ee6785e..4531380 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

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 97c28e9..cfc24d8 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

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 ef6b6fb..99a3b53 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

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 374952e..50f808b 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

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 dfb3dcd..206a062 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

@@ -103,7 +103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+    "name": "Copy [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json b/recipe_modules/archives/examples/global_generator_paths.expected/basic.json
new file mode 100644
index 0000000..0ea5a52
--- /dev/null
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/basic.json

@@ -0,0 +1,27 @@
+[
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

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
new file mode 100644
index 0000000..b0e04e1
--- /dev/null
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_ci.json

@@ -0,0 +1,27 @@
+[
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/src/../../monorepo",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart:ci.sandbox"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "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
new file mode 100644
index 0000000..b6042b6
--- /dev/null
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_try.json

@@ -0,0 +1,5 @@
+[
+  {
+    "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
new file mode 100644
index 0000000..368f997
--- /dev/null
+++ b/recipe_modules/archives/examples/global_generator_paths.py

@@ -0,0 +1,99 @@
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from recipe_engine.post_process import DoesNotRun, Filter, StatusFailure
+
+from RECIPE_MODULES.flutter.archives.api import ArchivePaths
+
+DEPS = [
+    'flutter/archives',
+    'flutter/monorepo',
+    'recipe_engine/assertions',
+    'recipe_engine/buildbucket',
+    'recipe_engine/path',
+    'recipe_engine/properties',
+    'recipe_engine/raw_io',
+]
+
+
+def RunSteps(api):
+  checkout = api.path['start_dir'].join('src')
+  archives = [
+      {
+        "source": "out/debug/artifacts.zip",
+        "destination": "ios/artifacts.zip"
+      },
+      {
+        "source": "out/release-nobitcode/Flutter.dSYM.zip",
+        "destination": "ios-release-nobitcode/Flutter.dSYM.zip"
+      },
+      {
+        "source": "out/release/Flutter.dSYM.zip",
+        "destination": "ios-release/Flutter.dSYM.zip"
+      }
+  ]
+  expected_results = [
+      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/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/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/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+      )
+  ]
+  env_to_results = {
+      'production': expected_results,
+      'monorepo': expected_monorepo_results,
+      'monorepo_try': []
+  }
+  config = api.properties.get('config')
+  results = api.archives.global_generator_paths(checkout, archives)
+  api.assertions.assertListEqual(env_to_results.get(config), results)
+
+
+def GenTests(api):
+  yield api.test(
+      'basic',
+      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'
+      ),
+      api.step_data(
+          'git rev-parse',
+          stdout=api.raw_io
+          .output_text('12345abcde12345abcde12345abcde12345abcde\n')
+      )
+  )
+  yield api.test(
+      'monorepo_ci',
+      api.properties(config='monorepo'),
+      api.monorepo.ci_build(),
+  )
+  yield api.test(
+      'monorepo_try',
+      api.properties(config='monorepo_try'),
+      api.monorepo.try_build(),
+  )

diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 6cd4004..8cef752 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json

@@ -991,7 +991,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -1038,7 +1038,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1132,7 +1132,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
   },
   {
     "cmd": [
@@ -1179,7 +1179,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
@@ -1273,7 +1273,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
   },
   {
     "cmd": [
@@ -1320,7 +1320,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]

diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
index 4adefa7..8c0e474 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json

@@ -1138,7 +1138,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -1185,7 +1185,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1368,7 +1368,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
   },
   {
     "cmd": [
@@ -1415,7 +1415,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
@@ -1598,7 +1598,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
   },
   {
     "cmd": [
@@ -1645,7 +1645,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]

diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 1a0b18d..1ff7c25 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json

@@ -1125,7 +1125,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -1172,7 +1172,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
   },
   {
     "cmd": [
@@ -1313,7 +1313,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
@@ -1407,7 +1407,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
+    "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
   },
   {
     "cmd": [
@@ -1454,7 +1454,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]

diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 9f511de..6f1020d 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
+    "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
   },
   {
     "cmd": [
@@ -1044,7 +1044,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -1138,7 +1138,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/monorepo//download.flutter.io"
+    "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to tmp location"
   },
   {
     "cmd": [
@@ -1185,7 +1185,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil monorepo//download.flutter.io",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_archives_v2",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]

diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json
index 841cdec..be89681 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_linux.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json

@@ -686,64 +686,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "listdir",
-      "[CACHE]/builder/src/out",
-      "--recursive"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "proj:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Final List checkout",
-    "~followup_annotations": [
-      "@@@STEP_LOG_END@listdir@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "listdir",
-      "[CACHE]/builder/src/flutter/sky",
-      "--recursive"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "proj:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Final List checkout 2",
-    "~followup_annotations": [
-      "@@@STEP_LOG_END@listdir@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file

diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index fae952c..8ab1faa 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json

@@ -768,64 +768,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "listdir",
-      "[CACHE]/builder/src/out",
-      "--recursive"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Final List checkout",
-    "~followup_annotations": [
-      "@@@STEP_LOG_END@listdir@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "listdir",
-      "[CACHE]/builder/src/flutter/sky",
-      "--recursive"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Final List checkout 2",
-    "~followup_annotations": [
-      "@@@STEP_LOG_END@listdir@@@"
-    ]
-  },
-  {
-    "cmd": [
       "git",
       "rev-parse",
       "HEAD"
@@ -856,7 +798,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -871,7 +813,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+    "name": "Ensure flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
   },
   {
     "cmd": [
@@ -882,7 +824,7 @@
       "/path/to/tmp/json",
       "copy",
       "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -897,7 +839,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt"
+    "name": "Copy /a/b/c.txt to tmp location"
   },
   {
     "cmd": [
@@ -910,7 +852,7 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_1/*",
-      "gs://flutter_archives_v2/"
+      "gs://flutter_infra_release/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -925,9 +867,9 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
   },
   {

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 27d1306..b8fc52c 100644
--- a/recipes/engine_v2/engine_v2.expected/config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json

@@ -853,112 +853,6 @@
     ]
   },
   {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[CACHE]/builder/src/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "proj:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "proj:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "proj:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_1/*",
-      "gs://flutter_archives_v2/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "proj:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file

diff --git a/recipes/engine_v2/engine_v2.py b/recipes/engine_v2/engine_v2.py
index 270630f..16d2533 100644
--- a/recipes/engine_v2/engine_v2.py
+++ b/recipes/engine_v2/engine_v2.py

@@ -143,26 +143,17 @@
             _run_global_generators(api, generators, full_engine_checkout, env, env_prefixes)
         else:
           _run_global_generators(api, generators, full_engine_checkout, env, env_prefixes)
-    api.file.listdir('Final List checkout', full_engine_checkout.join('src', 'out'), recursive=True)
-    api.file.listdir('Final List checkout 2', full_engine_checkout.join('src', 'flutter', 'sky'), recursive=True)
   # Global archives
   if archives:
     api.flutter_bcid.report_stage(BcidStage.UPLOAD.value)
     # Global archives are stored in out folder from full_engine_checkout inside
     # release, debug or profile depending on the runtime mode.
     # So far we are uploading files only.
-    bucket = 'flutter_archives_v2'
-    for archive in archives:
-      source = full_engine_checkout.join('src', archive.get('source'))
-      commit = api.repo_util.get_commit(
-          full_engine_checkout.join('src', 'flutter')
-      )
-      artifact_path = 'flutter_infra_release/flutter/%s/%s' % (
-          commit, archive.get('destination')
-      )
-      dst = 'gs://%s/%s' % (bucket, artifact_path)
-      api.archives.upload_artifact(source, dst)
-      api.flutter_bcid.upload_provenance(source, dst)
+    files_to_archive = api.archives.global_generator_paths(
+        full_engine_checkout.join('src'), archives)
+    for archive in files_to_archive:
+      api.archives.upload_artifact(archive.local, archive.remote)
+      api.flutter_bcid.upload_provenance(archive.local, archive.remote)
     api.flutter_bcid.report_stage(BcidStage.UPLOAD_COMPLETE.value)
 
 
@@ -295,11 +286,6 @@
           'Read build config file',
           api.file.read_json({'builds': builds, 'archives': archives})
       ),
-      api.step_data(
-          'git rev-parse',
-          stdout=api.raw_io
-          .output_text('12345abcde12345abcde12345abcde12345abcde\n')
-      )
   )
 
   yield api.test(

diff --git a/recipes/engine_v2/signer.expected/config_from_file.json b/recipes/engine_v2/signer.expected/config_from_file.json
index f4441a2..76ac771 100644
--- a/recipes/engine_v2/signer.expected/config_from_file.json
+++ b/recipes/engine_v2/signer.expected/config_from_file.json

@@ -295,7 +295,7 @@
       "[CLEANUP]/tmp_tmp_4/b/c"
     ],
     "infra_step": true,
-    "name": "Copy gs://a/b/c/artifact.zip"
+    "name": "Copy [CLEANUP]/tmp_tmp_3/artifact.zip to tmp location"
   },
   {
     "cmd": [
@@ -311,7 +311,7 @@
       "gs://a/"
     ],
     "infra_step": true,
-    "name": "gsutil b/c/artifact.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_4/* to gs://a",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/a/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json
index c052764..0f2b710 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json
index c052764..0f2b710 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json
index 1a0d37b..5ad72d6 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json
index c9c3363..9758f05 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json
index 1a0d37b..5ad72d6 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json
index c9c3363..9758f05 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json
index 3800697..80034e8 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
index 6f65b40..b4abc66 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
index 3800697..80034e8 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
index 6f65b40..b4abc66 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json
index f64c251..86a24c3 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
index cd8307c..7f166b8 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json
index f64c251..86a24c3 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
index cd8307c..7f166b8 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json
index 86c441d..06c77a4 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json
index 86c441d..06c77a4 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json
index 324a186..ea7c855 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json
index 900b40d..810ce5e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json
index 324a186..ea7c855 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json
index 900b40d..810ce5e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/experimental/flutter-archive-package.tar.xz",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json
index 17eab84..873f79d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json
index 17eab84..873f79d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json
index 1e954ec..dd5b79d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
index 3fdf670..8b75154 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json
index 1e954ec..dd5b79d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
index 3fdf670..8b75154 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json
index 6271b6a..35fc8aa 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
index e956430..3bac76a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
index 6271b6a..35fc8aa 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
index e956430..3bac76a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json
index df7209c..d9a9d7e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
index 268d681..fda22e5 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json
index df7209c..d9a9d7e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json

@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
index 268d681..fda22e5 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json
index 9468376..7686dbf 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json
index 9468376..7686dbf 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json
index c4b6088..94c9bb9 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
index 568f2c2..6aadb74 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json
index c4b6088..94c9bb9 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json

@@ -1052,7 +1052,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]/archive/releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1213,7 +1213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
index 568f2c2..6aadb74 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json

@@ -819,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json
index 395c073..5fe24a2 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json
index 395c073..5fe24a2 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json
index ac19999..8cac855 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1108,7 +1108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
index 9ca1db4..1bf14e3 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json
index ac19999..8cac855 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1108,7 +1108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
index 9ca1db4..1bf14e3 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json
index 7f924ab..b25ea05 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
index 508a164..4c0a61e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json
index 7f924ab..b25ea05 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
index 508a164..4c0a61e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json
index 52400bb..f473a62 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
index 5dee6bb..663c7ca 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json
index 52400bb..f473a62 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
index 5dee6bb..663c7ca 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json
index 4235427..e3be1da 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json
index 4235427..e3be1da 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json
index 4b30b95..0a40555 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1108,7 +1108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
index f0d14b1..c43eb0a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json
index 4b30b95..0a40555 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json

@@ -944,7 +944,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+    "name": "Copy [START_DIR]\\archive\\releases_linux.json to tmp location"
   },
   {
     "cmd": [
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/releases_linux.json",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1108,7 +1108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]

diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
index f0d14b1..c43eb0a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json

@@ -888,7 +888,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip"
+    "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location"
   },
   {
     "cmd": [
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/experimental/flutter-archive-package.zip",
+    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]