commit 63acfe3dd68e84ea7bb495d48fe1a7350c941b00
author Ben Wagner <benjaminwagner@google.com> Mon Oct 14 13:03:50 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 14 18:14:07 2019 +0000
tree 9170c03effed8c28ce08c982fd990b13fd8ced93
parent 33c36e05c312811e9b83d1d8949ba7932fcd9561

[infra] Retry failed pushes in Android flavor

It seems like we see quite a few "force quarantined" bots when pushing
resources to the device fails. Rewrite copy_directory_contents_to_device
to use the _adb method, which automatically retries.

Change-Id: Iae36f8e42e85a58fdddc8c9dc80e693a371fab8b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248560
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

infra/bots/recipes/test.py

diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index fd22355..1b70e22 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -1183,6 +1183,9 @@
   )
 
   builder = 'Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android'
+  retry_step_name = ('push [START_DIR]/skia/resources/* '
+                     '/sdcard/revenge_of_the_skiabot/resources.push '
+                     '[START_DIR]/skia/resources/file1')
   yield (
     api.test('failed_push') +
     api.properties(buildername=builder,
@@ -1204,8 +1207,9 @@
     ) +
     api.step_data('get swarming bot id',
                   stdout=api.raw_io.output('build123-m2--device5')) +
-    api.step_data('push [START_DIR]/skia/resources/* '+
-                  '/sdcard/revenge_of_the_skiabot/resources', retcode=1)
+    api.step_data(retry_step_name, retcode=1) +
+    api.step_data(retry_step_name + ' (attempt 2)', retcode=1) +
+    api.step_data(retry_step_name + ' (attempt 3)', retcode=1)
   )
 
   retry_step_name = 'adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out'