From 06f3d68627c28d3d5faeb45a289acb17150762a3 Mon Sep 17 00:00:00 2001 From: Joe Gregorio Date: Tue, 7 Dec 2021 13:13:00 -0500 Subject: [PATCH] Use 'adb push --sync' for copying over resources. Change-Id: I31eec0a4af9f0df46639f3b5e1a8c375a085f153 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/481199 Reviewed-by: Eric Boren Commit-Queue: Joe Gregorio --- infra/bots/recipe_modules/flavor/android.py | 2 +- ...i400MP2-arm-Release-All-Android_SkottieTracing.json | 8 ++++---- ...0-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json | 8 ++++---- ...S7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json | 8 ++++---- ...A_Shield-CPU-TegraX1-arm64-Release-All-Android.json | 10 +++++----- ...-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json | 8 ++++---- ...eno540-arm64-Release-All-Android_Skpbench_Mskp.json | 2 +- ...roidOne-GPU-Mali400MP2-arm-Release-All-Android.json | 8 ++++---- ...S7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json | 8 ++++---- ...-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json | 8 ++++---- ...x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json | 8 ++++---- ...a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json | 8 ++++---- .../examples/full.expected/cpu_scale_failed_once.json | 8 ++++---- .../examples/full.expected/failed_infra_step.json | 8 ++++---- .../examples/full.expected/failed_read_version.json | 8 ++++---- .../examples/full.expected/retry_adb_command.json | 8 ++++---- ...-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json | 10 +++++----- ...i400MP2-arm-Release-All-Android_SkottieTracing.json | 4 ++-- .../skottietracing_parse_trace_error.json | 4 ++-- .../skottietracing_trybot.json | 4 ++-- ...-Release-All-Android_AllPathsVolatile_Skpbench.json | 2 +- ...e-All-Android_Vulkan_AllPathsVolatile_Skpbench.json | 2 +- ...eno540-arm64-Release-All-Android_Skpbench_Mskp.json | 2 +- infra/bots/recipes/skpbench.expected/trybot.json | 2 +- ...el2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json | 8 ++++---- ...Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json | 8 ++++---- 26 files changed, 82 insertions(+), 82 deletions(-) diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py index 3618517f82..bcfe97639b 100644 --- a/infra/bots/recipe_modules/flavor/android.py +++ b/infra/bots/recipe_modules/flavor/android.py @@ -559,7 +559,7 @@ time.sleep(60) host, '*', test_data=['foo.png', 'bar.jpg']) args = contents + [device] - self._adb('push %s/* %s' % (host, device), 'push', *args) + self._adb('push --sync %s/* %s' % (host, device), 'push', *args) def copy_directory_contents_to_host(self, device, host): # TODO(borenet): When all of our devices are on Android 6.0 and up, we can diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json index 195ab35b6c..b893a15267 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json @@ -230,7 +230,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -425,7 +425,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -636,7 +636,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -847,7 +847,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json index c7020811c5..4981af114c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json @@ -263,7 +263,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -458,7 +458,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -669,7 +669,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -880,7 +880,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 5008c49876..03fa12f6a1 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -246,7 +246,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -441,7 +441,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -652,7 +652,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -863,7 +863,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json index 59d7098703..cdf9075ea0 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json @@ -405,7 +405,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces" + "name": "push --sync [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces" }, { "cmd": [ @@ -457,7 +457,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -652,7 +652,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -863,7 +863,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1074,7 +1074,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 79b06427bf..435bb78a4e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -627,7 +627,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -822,7 +822,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -1033,7 +1033,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1244,7 +1244,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json index e81989f660..7b1715f6bd 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json @@ -724,7 +724,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp" + "name": "push --sync [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 10014f81c3..21928b0047 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -291,7 +291,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -486,7 +486,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -697,7 +697,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -908,7 +908,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 1ef401d88f..f39a3bbb17 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -246,7 +246,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -441,7 +441,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -652,7 +652,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -863,7 +863,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 9a5b9952c4..006f8ba476 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -536,7 +536,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -731,7 +731,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -942,7 +942,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1153,7 +1153,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json index d40cae62d4..f736a5f168 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json @@ -626,7 +626,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -821,7 +821,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -1032,7 +1032,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1243,7 +1243,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json index 4b7b3248c2..dc7570db3f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json @@ -291,7 +291,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -486,7 +486,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -697,7 +697,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -908,7 +908,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json index 68951a290f..0fae950220 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json @@ -702,7 +702,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -897,7 +897,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -1108,7 +1108,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1319,7 +1319,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index a20759ada4..c559ac3786 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json @@ -627,7 +627,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -822,7 +822,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -1033,7 +1033,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1244,7 +1244,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json index 8abf46eb1e..b71c3c4798 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json @@ -627,7 +627,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -822,7 +822,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -1113,7 +1113,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1324,7 +1324,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json index e9f15528e9..c565d45956 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json @@ -708,7 +708,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -903,7 +903,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -1114,7 +1114,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1325,7 +1325,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json index 83d4121f4d..a3e79a374d 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json @@ -372,7 +372,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces" + "name": "push --sync [START_DIR]/text_blob_traces/* /sdcard/revenge_of_the_skiabot/text_blob_traces" }, { "cmd": [ @@ -424,7 +424,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -619,7 +619,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -830,7 +830,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1041,7 +1041,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json index da645e681f..ac4bdb7527 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json +++ b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json @@ -139,7 +139,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -334,7 +334,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties" + "name": "push --sync [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties" }, { "cmd": [ diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json index 7d7dd1ac9b..ef9c98af2f 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json +++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json @@ -139,7 +139,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -334,7 +334,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties" + "name": "push --sync [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties" }, { "cmd": [ diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json index 73a77fd79b..c1ff2f80ca 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json +++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json @@ -139,7 +139,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -334,7 +334,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties" + "name": "push --sync [START_DIR]/lottie-samples/* /sdcard/revenge_of_the_skiabot/lotties" }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json index b6008f318a..90aa857afa 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json @@ -254,7 +254,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json index c2fcadc403..958ff84e0a 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json @@ -254,7 +254,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json index 2a1e078dc0..cf4477451f 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json @@ -237,7 +237,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp" + "name": "push --sync [START_DIR]/mskp/* /sdcard/revenge_of_the_skiabot/mskp" }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index d5e3a3d56e..0b9112582a 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -237,7 +237,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json index a131b4316e..0b238304e3 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json @@ -474,7 +474,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -669,7 +669,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -880,7 +880,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1091,7 +1091,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json index e74a23a739..0aae9ed917 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json @@ -384,7 +384,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" + "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources" }, { "cmd": [ @@ -579,7 +579,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" + "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps" }, { "cmd": [ @@ -790,7 +790,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" + "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images" }, { "cmd": [ @@ -1001,7 +1001,7 @@ "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" + "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs" }, { "cmd": [