commit 33509df0de581296a7c0a475ccb1323e8d12dcf9
author Godofredo Contreras <godofredoc@google.com> Wed Jun 15 02:41:16 2022 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 15 02:41:16 2022 +0000
tree fd3158c0f2fcf6f0b170bcdee9de29bd74e50c4e
parent a1a50121f2732aa2530f559e6c69827d5f910f9e

Update target gcs path.

This will place the artifacts in the location expected by flutter tool.

Bug: https://github.com/flutter/flutter/issues/81855
Change-Id: I9c9fc9a6d7821dec17e04a0a44e958b7a0ccb900
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/31201
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Xilai Zhang <xilaizhang@google.com>

recipes/engine_v2/builder.expected/basic_gcs.json

diff --git a/recipes/engine_v2/builder.expected/basic_gcs.json b/recipes/engine_v2/builder.expected/basic_gcs.json
index 2b25ec9..b2df948 100644
--- a/recipes/engine_v2/builder.expected/basic_gcs.json
+++ b/recipes/engine_v2/builder.expected/basic_gcs.json
@@ -878,7 +878,7 @@
       "cp",
       "-r",
       "[CLEANUP]/host_debug_unopt_tmp_1/*",
-      "gs://flutter_archives_v2/"
+      "gs://flutter_archives_v2/flutter_infra_release/flutter/"
     ],
     "cwd": "[CACHE]/builder/src/flutter",
     "env": {
@@ -902,7 +902,7 @@
     "infra_step": true,
     "name": "gsutil host_debug_unopt",
     "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/flutter_infra_release/flutter/@@@"
     ]
   },
   {

recipes/engine_v2/builder.py

diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 5fcaf4f..842504c 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -134,7 +134,7 @@
     commit = api.repo_util.get_commit(checkout)
     api.gsutil.upload(
         source='%s/*' % archive_dir, bucket='flutter_archives_v2',
-        dest=commit,  args=['-r'],
+        dest='flutter_infra_release/flutter/%s' % commit,  args=['-r'],
         name=archive_config['name'],)
     return 'gs://flutter_archives_v2/flutter_infra_release/flutter/%s' % api.path.basename(archive_dir)
   # Archive using CAS by default