diff options
author | Ben Wagner <benjaminwagner@google.com> | 2018-05-25 09:47:37 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-25 15:24:22 +0000 |
commit | e7e6e22912cec1bd59348fd3889c7d8ae7b6bdc4 (patch) | |
tree | fde09e55ef29b60d0d1e49c1bdfb9ad720900c5b /infra/bots/recipe_modules | |
parent | 6c8ad116d460fe892fff77b8f80e284e3487d59d (diff) |
Retry ADB commands on all devices.
Change-Id: Ieb289043bd871ec45c70339787ae45f09d3ac1dc
Reviewed-on: https://skia-review.googlesource.com/130128
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
-rw-r--r-- | infra/bots/recipe_modules/flavor/android.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py index ed8d9af2d4..ea93cb451c 100644 --- a/infra/bots/recipe_modules/flavor/android.py +++ b/infra/bots/recipe_modules/flavor/android.py @@ -85,10 +85,8 @@ class AndroidFlavor(default.DefaultFlavor): kwargs['infra_step'] = True self._ever_ran_adb = True - attempts = 1 - flaky_devices = ['NexusPlayer', 'PixelC'] - if self.m.vars.builder_cfg.get('model') in flaky_devices: - attempts = 3 + # ADB seems to be occasionally flaky on every device, so always retry. + attempts = 3 def wait_for_device(attempt): self.m.run(self.m.step, |