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
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index d9a8121..6e78ab8 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 @@
""",
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 9324476..7c3a332 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
@@ -442,14 +442,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 6a59c2c..a202f25 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
@@ -442,14 +442,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 b143b97..b41abea 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
@@ -496,14 +496,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 e8e5b36..564f54e 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
@@ -496,14 +496,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 8435f1f..6138ff5 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
@@ -496,14 +496,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 b03fdb8..9577ff3 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 51e5ab5..271ad4d 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 f66260e..c0d9353 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 cb32141..6a5bc65 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 62b26ba..d722429 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 8a62971..ea1e8a3 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 69562a6..942ba93 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 274880e..6549939 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 5783084..787698a 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 bb6639e..e58b2ac 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
@@ -593,14 +593,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",
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 56e2548..dd92277 100644
--- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
+++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
@@ -595,14 +595,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "reboot"
- },
- {
- "cmd": [
- "adb",
"kill-server"
],
"cwd": "[SLAVE_BUILD]/skia",