Revert "Make global generator uploads consistent with the archive api." This reverts commit 3a4aed2d37deebedcdd262be27b72e2a5b93162c. Reason for revert: broke the engine tree 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> TBR=whesse@google.com,godofredoc@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com,mohsinally@google.com,ricardoamador@google.com Change-Id: I835f4eda598c12fcc27e9d94050f08410755d187 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: https://github.com/flutter/flutter/issues/121660 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/39761 Reviewed-by: Godofredo Contreras <godofredoc@google.com> Commit-Queue: Godofredo Contreras <godofredoc@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 2f45b64..f5e39a0 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 [START_DIR]/flutter sdk/dev/docs/api_docs.zip to tmp location", + "name": "Docs.Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] @@ -520,7 +520,7 @@ "hostname": "rdbhost" } }, - "name": "Docs.gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "Docs.gsutil flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip", "~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 da80679..c55128e 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 [START_DIR]/flutter sdk/dev/docs/api_docs.zip to tmp location", + "name": "Docs.Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] @@ -272,7 +272,7 @@ ] }, "infra_step": true, - "name": "Docs.gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "Docs.gsutil flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip", "~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 f8e33fa..dab85a3 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 to tmp location' % src, src, local_dst_tree) + self.m.file.copy('Copy %s' % dst, 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,50 +201,14 @@ ) 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, [bucket_and_prefix, 'flutter', artifact_realm, commit, rel_path, base_name])) + artifact_path = '/'.join(filter(bool, ['flutter', artifact_realm, commit, rel_path, base_name])) results.append( ArchivePaths( include_path, - 'gs://%s' % artifact_path + 'gs://%s%s' % (bucket_and_prefix, 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('src', 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 b81ce88..060c036 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 bab7f9f..55d5627 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 ec34f42..4902b58 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@" ]
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 45fb296..9c6baae 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 b451ef1..8ea5b54 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 4531380..ee6785e 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 cfc24d8..97c28e9 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 99a3b53..ef6b6fb 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@" ]
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 50f808b..374952e 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~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 206a062..dfb3dcd 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 [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip" }, { "cmd": [ @@ -131,7 +131,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@" ]
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json b/recipe_modules/archives/examples/global_generator_paths.expected/basic.json deleted file mode 100644 index 925dab4..0000000 --- a/recipe_modules/archives/examples/global_generator_paths.expected/basic.json +++ /dev/null
@@ -1,27 +0,0 @@ -[ - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[START_DIR]/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 deleted file mode 100644 index 04e462b..0000000 --- a/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_ci.json +++ /dev/null
@@ -1,27 +0,0 @@ -[ - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[START_DIR]/../../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 deleted file mode 100644 index b6042b6..0000000 --- a/recipe_modules/archives/examples/global_generator_paths.expected/monorepo_try.json +++ /dev/null
@@ -1,5 +0,0 @@ -[ - { - "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 deleted file mode 100644 index 5a00124..0000000 --- a/recipe_modules/archives/examples/global_generator_paths.py +++ /dev/null
@@ -1,99 +0,0 @@ -# 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'] - 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 8cef752..6cd4004 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 [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip" }, { "cmd": [ @@ -1038,7 +1038,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1132,7 +1132,7 @@ "hostname": "rdbhost" } }, - "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" + "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar" }, { "cmd": [ @@ -1179,7 +1179,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io", + "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@" ] @@ -1273,7 +1273,7 @@ "hostname": "rdbhost" } }, - "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" + "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom" }, { "cmd": [ @@ -1320,7 +1320,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io", + "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom", "~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 8c0e474..4adefa7 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 [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip" }, { "cmd": [ @@ -1185,7 +1185,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1368,7 +1368,7 @@ "hostname": "rdbhost" } }, - "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" + "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar" }, { "cmd": [ @@ -1415,7 +1415,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io", + "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@" ] @@ -1598,7 +1598,7 @@ "hostname": "rdbhost" } }, - "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" + "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom" }, { "cmd": [ @@ -1645,7 +1645,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io", + "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom", "~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 1ff7c25..1a0b18d 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 [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location" + "name": "Copy gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip" }, { "cmd": [ @@ -1172,7 +1172,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "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" + "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar" }, { "cmd": [ @@ -1313,7 +1313,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io", + "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@" ] @@ -1407,7 +1407,7 @@ "hostname": "rdbhost" } }, - "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" + "name": "Copy gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom" }, { "cmd": [ @@ -1454,7 +1454,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io", + "name": "gsutil io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom", "~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 6f1020d..9f511de 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 [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location" + "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip" }, { "cmd": [ @@ -1044,7 +1044,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2", + "name": "gsutil monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@" ] @@ -1138,7 +1138,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to tmp location" + "name": "Copy gs://flutter_archives_v2/monorepo//download.flutter.io" }, { "cmd": [ @@ -1185,7 +1185,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_archives_v2", + "name": "gsutil monorepo//download.flutter.io", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@" ]
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json index be89681..841cdec 100644 --- a/recipes/engine_v2/engine_v2.expected/basic_linux.json +++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -686,6 +686,64 @@ ] }, { + "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 5fed687..fae952c 100644 --- a/recipes/engine_v2/engine_v2.expected/basic_mac.json +++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -768,11 +768,69 @@ }, { "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" ], - "cwd": "[CACHE]/builder/flutter", + "cwd": "[CACHE]/builder/src/flutter", "infra_step": true, "luci_context": { "realm": { @@ -798,7 +856,7 @@ "ensure-directory", "--mode", "0777", - "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/bucket" + "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket" ], "infra_step": true, "luci_context": { @@ -813,7 +871,7 @@ "hostname": "rdbhost" } }, - "name": "Ensure flutter/12345abcde12345abcde12345abcde12345abcde/bucket" + "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket" }, { "cmd": [ @@ -824,7 +882,7 @@ "/path/to/tmp/json", "copy", "/a/b/c.txt", - "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/bucket" + "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket" ], "infra_step": true, "luci_context": { @@ -839,7 +897,7 @@ "hostname": "rdbhost" } }, - "name": "Copy /a/b/c.txt to tmp location" + "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt" }, { "cmd": [ @@ -852,7 +910,7 @@ "cp", "-r", "[CLEANUP]/tmp_tmp_1/*", - "gs://flutter_infra_release/" + "gs://flutter_archives_v2/" ], "infra_step": true, "luci_context": { @@ -867,9 +925,9 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt", "~followup_annotations": [ - "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" + "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@" ] }, {
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 b8fc52c..27d1306 100644 --- a/recipes/engine_v2/engine_v2.expected/config_from_file.json +++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -853,6 +853,112 @@ ] }, { + "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 a90a63a..270630f 100644 --- a/recipes/engine_v2/engine_v2.py +++ b/recipes/engine_v2/engine_v2.py
@@ -143,16 +143,26 @@ _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. - files_to_archive = api.archives.global_generator_paths(full_engine_checkout, archives) - for archive in files_to_archive: - api.archives.upload_artifact(archive.local, archive.remote) - api.flutter_bcid.upload_provenance(archive.local, archive.remote) + 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) api.flutter_bcid.report_stage(BcidStage.UPLOAD_COMPLETE.value) @@ -285,6 +295,11 @@ '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 76ac771..f4441a2 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 [CLEANUP]/tmp_tmp_3/artifact.zip to tmp location" + "name": "Copy gs://a/b/c/artifact.zip" }, { "cmd": [ @@ -311,7 +311,7 @@ "gs://a/" ], "infra_step": true, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_4/* to gs://a", + "name": "gsutil b/c/artifact.zip", "~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 0f2b710..c052764 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 0f2b710..c052764 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 5ad72d6..1a0d37b 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/linux/flutter-archive-package.tar.xz", "~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 9758f05..c9c3363 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/linux/experimental/flutter-archive-package.tar.xz", "~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 5ad72d6..1a0d37b 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/linux/flutter-archive-package.tar.xz", "~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 9758f05..c9c3363 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/linux/experimental/flutter-archive-package.tar.xz", "~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 80034e8..3800697 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz", "~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 b4abc66..6f65b40 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz", "~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 80034e8..3800697 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz", "~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 b4abc66..6f65b40 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz", "~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 86a24c3..f64c251 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz", "~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 7f166b8..cd8307c 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz", "~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 86a24c3..f64c251 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz", "~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 7f166b8..cd8307c 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz", "~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 06c77a4..86c441d 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 06c77a4..86c441d 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 ea7c855..324a186 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/linux/flutter-archive-package.tar.xz", "~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 810ce5e..900b40d 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/linux/experimental/flutter-archive-package.tar.xz", "~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 ea7c855..324a186 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/linux/flutter-archive-package.tar.xz", "~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 810ce5e..900b40d 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 [START_DIR]/archive/flutter-archive-package.tar.xz to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/linux/experimental/flutter-archive-package.tar.xz", "~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 873f79d..17eab84 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 873f79d..17eab84 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 dd5b79d..1e954ec 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/macos/flutter-archive-package.zip", "~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 8b75154..3fdf670 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/macos/experimental/flutter-archive-package.zip", "~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 dd5b79d..1e954ec 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/macos/flutter-archive-package.zip", "~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 8b75154..3fdf670 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/macos/experimental/flutter-archive-package.zip", "~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 35fc8aa..6271b6a 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip", "~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 3bac76a..e956430 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip", "~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 35fc8aa..6271b6a 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip", "~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 3bac76a..e956430 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip", "~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 d9a9d7e..df7209c 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip", "~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 fda22e5..268d681 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip", "~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 d9a9d7e..df7209c 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -1050,7 +1050,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip", "~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 fda22e5..268d681 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip", "~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 7686dbf..9468376 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 7686dbf..9468376 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 94c9bb9..c4b6088 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/macos/flutter-archive-package.zip", "~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 6aadb74..568f2c2 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/macos/experimental/flutter-archive-package.zip", "~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 94c9bb9..c4b6088 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 [START_DIR]/archive/releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1107,7 +1107,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1213,7 +1213,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip" }, { "cmd": [ @@ -1266,7 +1266,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/macos/flutter-archive-package.zip", "~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 6aadb74..568f2c2 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 [START_DIR]/archive/flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -872,7 +872,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/macos/experimental/flutter-archive-package.zip", "~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 5fe24a2..395c073 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 5fe24a2..395c073 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 8cac855..ac19999 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1108,7 +1108,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip" }, { "cmd": [ @@ -1162,7 +1162,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/windows/flutter-archive-package.zip", "~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 1bf14e3..9ca1db4 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/windows/experimental/flutter-archive-package.zip", "~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 8cac855..ac19999 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1108,7 +1108,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip" }, { "cmd": [ @@ -1162,7 +1162,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/windows/flutter-archive-package.zip", "~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 1bf14e3..9ca1db4 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/beta/windows/experimental/flutter-archive-package.zip", "~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 b25ea05..7f924ab 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip", "~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 4c0a61e..508a164 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip", "~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 b25ea05..7f924ab 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip", "~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 4c0a61e..508a164 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip", "~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 f473a62..52400bb 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip", "~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 663c7ca..5dee6bb 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip", "~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 f473a62..52400bb 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip", "~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 663c7ca..5dee6bb 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip", "~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 e3be1da..4235427 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 e3be1da..4235427 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~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 0a40555..4b30b95 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1108,7 +1108,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip" }, { "cmd": [ @@ -1162,7 +1162,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/windows/flutter-archive-package.zip", "~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 c43eb0a..f0d14b1 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/windows/experimental/flutter-archive-package.zip", "~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 0a40555..4b30b95 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 [START_DIR]\\archive\\releases_linux.json to tmp location" + "name": "Copy gs://flutter_infra_release/releases/releases_linux.json" }, { "cmd": [ @@ -1000,7 +1000,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/releases_linux.json", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ] @@ -1108,7 +1108,7 @@ "hostname": "rdbhost" } }, - "name": "Copy [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip" }, { "cmd": [ @@ -1162,7 +1162,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/windows/flutter-archive-package.zip", "~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 c43eb0a..f0d14b1 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 [START_DIR]\\archive\\flutter-archive-package.zip to tmp location" + "name": "Copy gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip" }, { "cmd": [ @@ -942,7 +942,7 @@ "hostname": "rdbhost" } }, - "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release", + "name": "gsutil releases/stable/windows/experimental/flutter-archive-package.zip", "~followup_annotations": [ "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@" ]