From 2754b4ea271bd6bbdd7e26eae6b74a7bd40a7be5 Mon Sep 17 00:00:00 2001 From: borenet Date: Thu, 13 Oct 2016 10:31:08 -0700 Subject: [PATCH] Stop rebooting Android devices during Swarming tasks Swarming will reboot the devices after each task. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2402403002 Review-Url: https://codereview.chromium.org/2402403002 --- infra/bots/recipe_modules/flavor/gn_android_flavor.py | 1 - ..._Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json | 8 -------- ...d-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json | 8 -------- ...Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json | 8 -------- ...id-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json | 8 -------- ...ng-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json | 8 -------- ...lang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json | 8 -------- ...-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json | 8 -------- ...d-Clang-GalaxyS3-GPU-Mali400-arm-Debug-GN_Android.json | 8 -------- ...-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json | 8 -------- ...Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json | 8 -------- ...d-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json | 8 -------- ...xus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json | 8 -------- ...roid-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json | 8 -------- ...id-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json | 8 -------- ...Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json | 8 -------- .../recipes/swarm_test.expected/failed_get_hashes.json | 8 -------- 17 files changed, 129 deletions(-) diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index d9a812138e..6e78ab8cdd 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -98,7 +98,6 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): """, args=[self.m.vars.skia_out.join(self.m.vars.configuration)], infra_step=True) - self._adb('reboot', 'reboot') self._adb('kill adb server', 'kill-server') def step(self, name, cmd, env=None, **kwargs): diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json index 9324476b33..7c3a3324dd 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json @@ -439,14 +439,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json index 6a59c2c873..a202f258e0 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json @@ -439,14 +439,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json index b143b97c28..b41abea067 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json @@ -493,14 +493,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json index e8e5b36a6f..564f54e006 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json @@ -493,14 +493,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json index 8435f1f19d..6138ff5e9e 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json @@ -493,14 +493,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index b03fdb8b1b..9577ff3391 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json index 51e5ab541d..271ad4dabf 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS3-GPU-Mali400-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS3-GPU-Mali400-arm-Debug-GN_Android.json index f66260eb0e..c0d9353b2e 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS3-GPU-Mali400-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS3-GPU-Mali400-arm-Debug-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json index cb32141253..6a5bc651f2 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json index 62b26ba130..d722429170 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json index 8a62971640..ea1e8a3b22 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json index 69562a685d..942ba93b38 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json index 274880e8ae..65499396cd 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json index 578308497b..787698a7fd 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json index bb6639e945..e58b2ac6e7 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json @@ -590,14 +590,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb", diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 56e2548d73..dd92277103 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -592,14 +592,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "adb", - "reboot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "reboot" - }, { "cmd": [ "adb",