[infra] Use adb push --sync

Change-Id: I316035e6d22bb1e3d075b54b99343312271377e9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/565004 Commit-Queue: Eric Boren <[email protected]> Reviewed-by: Joe Gregorio <[email protected]>
HistoryFork · Aug 3, 2022 · 770620d · 770620d
1 parent 2035d99
commit 770620d
Show file tree

Hide file tree

Showing 27 changed files with 86 additions and 1 deletion.
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py
@@ -563,7 +563,7 @@ def copy_directory_contents_to_device(self, host, device):
     contents = self.m.file.glob_paths('ls %s/*' % host,
                                       host, '*',
                                       test_data=['foo.png', 'bar.jpg'])
-    args = contents + [device]
+    args = ['--sync'] + contents + [device]
     self._adb('push --sync %s/* %s' % (host, device), 'push', *args)
 
   def copy_directory_contents_to_host(self, device, host):

diff --git a/.../Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/.../Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
@@ -216,6 +216,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -409,6 +410,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -618,6 +620,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -827,6 +830,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...l.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json b/...l.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
@@ -249,6 +249,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -442,6 +443,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -651,6 +653,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -860,6 +863,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...ull.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/...ull.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -232,6 +232,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -425,6 +426,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -634,6 +636,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -843,6 +846,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json b/...full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
@@ -389,6 +389,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/text_blob_traces/bar.jpg",
       "[START_DIR]/text_blob_traces/foo.png",
       "/sdcard/revenge_of_the_skiabot/text_blob_traces"
@@ -441,6 +442,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -634,6 +636,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -843,6 +846,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -1052,6 +1056,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...mples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/...mples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -606,6 +606,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -799,6 +800,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -1008,6 +1010,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -1217,6 +1220,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...ed/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json b/...ed/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json
@@ -702,6 +702,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/mskp/bar.jpg",
       "[START_DIR]/mskp/foo.png",
       "/sdcard/revenge_of_the_skiabot/mskp"

diff --git a/...ples/full.expected/Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android.json b/...ples/full.expected/Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android.json
@@ -472,6 +472,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -665,6 +666,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -874,6 +876,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -1083,6 +1086,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...s/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/...s/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
@@ -276,6 +276,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -469,6 +470,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -678,6 +680,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -887,6 +890,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...ull.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/...ull.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -232,6 +232,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -425,6 +426,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -634,6 +636,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -843,6 +846,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...mples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/...mples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -516,6 +516,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -709,6 +710,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -918,6 +920,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -1127,6 +1130,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...ull.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/...ull.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
@@ -605,6 +605,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -798,6 +799,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -1007,6 +1009,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -1216,6 +1219,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"

diff --git a/...ull.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json b/...ull.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
@@ -276,6 +276,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skia/resources/bar.jpg",
       "[START_DIR]/skia/resources/foo.png",
       "/sdcard/revenge_of_the_skiabot/resources"
@@ -469,6 +470,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skp/bar.jpg",
       "[START_DIR]/skp/foo.png",
       "/sdcard/revenge_of_the_skiabot/skps"
@@ -678,6 +680,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/skimage/bar.jpg",
       "[START_DIR]/skimage/foo.png",
       "/sdcard/revenge_of_the_skiabot/images"
@@ -887,6 +890,7 @@
     "cmd": [
       "/opt/infra-android/tools/adb",
       "push",
+      "--sync",
       "[START_DIR]/svg/bar.jpg",
       "[START_DIR]/svg/foo.png",
       "/sdcard/revenge_of_the_skiabot/svgs"