commit 7a4b3c38859218a18f2ba2c9b09a81308f3ac26b
author Keyong Han <keyonghan@google.com> Wed Sep 07 23:40:07 2022 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 07 23:40:07 2022 +0000
tree 6db339cef764b776e9a06fae3479f89741b1f737
parent e4a0993fcaa99f252f83b316eac6553212b1e161

Update devielab build artifact gcs upload source

This cl updates the `source` from `artifact_dir` to `artifact_dir/*`, which uploads the real artifact to GCS.
This fixes failure: https://ci.chromium.org/ui/p/flutter/builders/staging/Linux_build_test%20flutter_gallery__transition_perf_e2e/2/overview

Change-Id: I2564d3abd372f4a6b4cd768c02b54dc1d1ef417b
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/33602
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>

recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json

diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json b/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
index a6a4103..a35f166 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
@@ -484,8 +484,8 @@
       "----",
       "cp",
       "-r",
-      "[CLEANUP]/tmp_tmp_2",
-      "gs://flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789"
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789/def"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -522,7 +522,7 @@
     },
     "name": "gsutil upload artifacts",
     "~followup_annotations": [
-      "@@@STEP_LINK@artifacts@https://console.cloud.google.com/storage/browser/flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789@@@"
+      "@@@STEP_LINK@artifacts@https://console.cloud.google.com/storage/browser/flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789/def@@@"
     ]
   },
   {

recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json

diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
index 64bd229..4ba1754 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
@@ -634,8 +634,8 @@
       "----",
       "cp",
       "-r",
-      "[CLEANUP]/tmp_tmp_2",
-      "gs://flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789"
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789/def"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -675,7 +675,7 @@
     },
     "name": "gsutil upload artifacts",
     "~followup_annotations": [
-      "@@@STEP_LINK@artifacts@https://console.cloud.google.com/storage/browser/flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789@@@"
+      "@@@STEP_LINK@artifacts@https://console.cloud.google.com/storage/browser/flutter_devicelab/flutter/ci/2d72510e447ab60a9728aeea2362d8be2cbd7789/def@@@"
     ]
   },
   {

recipes/devicelab/devicelab_drone_build_test.py

diff --git a/recipes/devicelab/devicelab_drone_build_test.py b/recipes/devicelab/devicelab_drone_build_test.py
index c2150b7..fc6c601 100644
--- a/recipes/devicelab/devicelab_drone_build_test.py
+++ b/recipes/devicelab/devicelab_drone_build_test.py
@@ -73,7 +73,7 @@
   )
   # Run build step.
   if not artifact_exist:
-    build(api, task_name, artifact, artifact_gcs_dir)
+    build(api, task_name, artifact, artifact_gcs_path)
 
   # Run test step.
   builds = test(
@@ -181,7 +181,7 @@
           )
           api.gsutil.upload(
               bucket='flutter_devicelab',
-              source=artifact_dir,
+              source='%s/*' % artifact_dir,
               dest=artifact_gcs_dir,
               link_name='artifacts',
               args=['-r'],