Remove android-specific hard_timeout swarming settings from tests.
Like https://chromium-review.googlesource.com/c/chromium/src/+/1134531,
but for test_suites.pyl instead of test_suite_expectations.pyl
If we want this, we should set it consistently for all platforms,
not just android.
Bug: 843511
Change-Id: I8f433dacb5d6cff3f4210d5bd1f5f3c6c91a18c9
Reviewed-on: https://chromium-review.googlesource.com/1143694
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576600}diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index e79f7e9..958f2eb 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -33,7 +33,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -77,7 +76,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -121,7 +119,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -165,7 +162,6 @@
"os": "Android"
}
],
- "hard_timeout": 600,
"output_links": [
{
"link": [
@@ -209,7 +205,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -341,7 +336,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -385,7 +379,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -429,7 +422,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -473,7 +465,6 @@
"os": "Android"
}
],
- "hard_timeout": 600,
"output_links": [
{
"link": [
@@ -517,7 +508,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -1201,7 +1191,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1427,7 +1417,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1473,7 +1463,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1836,7 +1826,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1971,7 +1961,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 120,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -2376,7 +2366,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -2511,7 +2501,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -2556,7 +2546,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 1800,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -2647,7 +2637,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -3007,7 +2997,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -3638,8 +3628,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 900
+ ]
},
"test": "cc_unittests"
},
@@ -3665,7 +3654,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"shards": 20
},
"test": "chrome_public_test_apk"
@@ -3716,8 +3704,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 960
+ ]
},
"test": "chrome_sync_shell_test_apk"
},
@@ -3768,7 +3755,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"shards": 2
},
"test": "components_unittests"
@@ -3795,7 +3781,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"shards": 9
},
"test": "content_browsertests"
@@ -3822,7 +3807,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"shards": 3
},
"test": "content_shell_test_apk"
@@ -3849,7 +3833,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"shards": 3
},
"test": "content_unittests"
@@ -4000,8 +3983,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 900
+ ]
},
"test": "gfx_unittests"
},
@@ -4076,8 +4058,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 120
+ ]
},
"test": "gl_unittests"
},
@@ -4127,8 +4108,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 960
+ ]
},
"test": "gpu_unittests"
},
@@ -4303,8 +4283,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 900
+ ]
},
"test": "media_unittests"
},
@@ -4354,8 +4333,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 300
+ ]
},
"test": "mojo_test_apk"
},
@@ -4380,8 +4358,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 300
+ ]
},
"test": "mojo_unittests"
},
@@ -4407,7 +4384,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"shards": 3
},
"test": "net_unittests"
@@ -4458,8 +4434,7 @@
"device_type": "coho",
"os": "Android"
}
- ],
- "hard_timeout": 300
+ ]
},
"test": "services_unittests"
},
@@ -4660,7 +4635,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"shards": 5
},
"test": "unit_tests"
@@ -5166,8 +5140,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 900
+ ]
},
"test": "cc_unittests"
},
@@ -5193,7 +5166,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"shards": 20
},
"test": "chrome_public_test_apk"
@@ -5244,8 +5216,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 960
+ ]
},
"test": "chrome_sync_shell_test_apk"
},
@@ -5296,7 +5267,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"shards": 2
},
"test": "components_unittests"
@@ -5323,7 +5293,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"shards": 9
},
"test": "content_browsertests"
@@ -5350,7 +5319,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"shards": 3
},
"test": "content_shell_test_apk"
@@ -5377,7 +5345,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"shards": 3
},
"test": "content_unittests"
@@ -5528,8 +5495,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 900
+ ]
},
"test": "gfx_unittests"
},
@@ -5604,8 +5570,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 120
+ ]
},
"test": "gl_unittests"
},
@@ -5655,8 +5620,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 960
+ ]
},
"test": "gpu_unittests"
},
@@ -5831,8 +5795,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 900
+ ]
},
"test": "media_unittests"
},
@@ -5882,8 +5845,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 300
+ ]
},
"test": "mojo_test_apk"
},
@@ -5908,8 +5870,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 300
+ ]
},
"test": "mojo_unittests"
},
@@ -5935,7 +5896,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"shards": 3
},
"test": "net_unittests"
@@ -5986,8 +5946,7 @@
"device_type": "gce_x86",
"os": "Android"
}
- ],
- "hard_timeout": 300
+ ]
},
"test": "services_unittests"
},
@@ -6188,7 +6147,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"shards": 5
},
"test": "unit_tests"
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 30c8e8b3..71e15c0 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -34,7 +34,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -69,7 +68,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -104,7 +102,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -139,7 +136,6 @@
"os": "Android"
}
],
- "hard_timeout": 600,
"output_links": [
{
"link": [
@@ -174,7 +170,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -288,7 +283,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -323,7 +317,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -358,7 +351,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -393,7 +385,6 @@
"os": "Android"
}
],
- "hard_timeout": 600,
"output_links": [
{
"link": [
@@ -428,7 +419,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -1069,7 +1059,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -1113,7 +1102,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -1201,7 +1189,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1289,7 +1276,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -1334,7 +1320,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -1379,7 +1364,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1424,7 +1408,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1684,7 +1667,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -1814,7 +1796,6 @@
"os": "Android"
}
],
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -1901,7 +1882,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -2203,7 +2183,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -2290,7 +2269,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -2334,7 +2312,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -2378,7 +2355,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -2466,7 +2442,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -2811,7 +2786,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -3659,7 +3633,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -3704,7 +3677,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -3750,7 +3722,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -3839,7 +3810,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -3885,7 +3855,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -3931,7 +3900,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -3977,7 +3945,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -4243,7 +4210,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -4376,7 +4342,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -4465,7 +4430,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -4774,7 +4738,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -4863,7 +4826,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -4908,7 +4870,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -4953,7 +4914,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -5043,7 +5003,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -5396,7 +5355,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -6250,7 +6208,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -6478,7 +6436,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -6524,7 +6482,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -6887,7 +6845,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -7022,7 +6980,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 120,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -7427,7 +7385,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -7562,7 +7520,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -7607,7 +7565,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 1800,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -7698,7 +7656,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -8058,7 +8016,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -8964,7 +8922,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -9145,7 +9103,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -9191,7 +9149,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -9283,7 +9241,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -9554,7 +9512,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -9779,7 +9737,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -10094,7 +10052,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -10229,7 +10187,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -10274,7 +10232,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 1800,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -10365,7 +10323,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -10725,7 +10683,7 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
+ "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -11618,7 +11576,7 @@
"os": "Android"
}
],
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -11842,7 +11800,7 @@
"os": "Android"
}
],
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -11887,7 +11845,7 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -12242,7 +12200,7 @@
"os": "Android"
}
],
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -12374,7 +12332,7 @@
"os": "Android"
}
],
- "hard_timeout": 120,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -12770,7 +12728,7 @@
"os": "Android"
}
],
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -12902,7 +12860,7 @@
"os": "Android"
}
],
- "hard_timeout": 300,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -12946,7 +12904,7 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -13035,7 +12993,7 @@
"os": "Android"
}
],
- "hard_timeout": 300,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -13387,7 +13345,7 @@
"os": "Android"
}
],
- "hard_timeout": 900,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -14274,7 +14232,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -14319,7 +14276,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -14365,7 +14321,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -14454,7 +14409,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -14500,7 +14454,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -14546,7 +14499,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -14592,7 +14544,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -14858,7 +14809,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -14991,7 +14941,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -15080,7 +15029,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -15389,7 +15337,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -15478,7 +15425,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -15523,7 +15469,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -15568,7 +15513,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -15658,7 +15602,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -16011,7 +15954,6 @@
}
],
"expiration": 10800,
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -17201,7 +17143,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -17245,7 +17186,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -17335,7 +17275,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -17422,7 +17361,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -17467,7 +17405,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -17512,7 +17449,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -17557,7 +17493,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -17817,7 +17752,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -17947,7 +17881,6 @@
"os": "Android"
}
],
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -18034,7 +17967,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -18336,7 +18268,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -18423,7 +18354,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -18467,7 +18397,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -18511,7 +18440,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -18599,7 +18527,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -18944,7 +18871,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -19842,7 +19768,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -19887,7 +19812,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -19977,7 +19901,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -20064,7 +19987,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -20109,7 +20031,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -20154,7 +20075,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -20199,7 +20119,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -20459,7 +20378,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -20589,7 +20507,6 @@
"os": "Android"
}
],
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -20676,7 +20593,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -20978,7 +20894,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -21065,7 +20980,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -21109,7 +21023,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -21153,7 +21066,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -21241,7 +21153,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -21586,7 +21497,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json
index 6a26d4cf..35b5256e 100644
--- a/testing/buildbot/chromium.clang.json
+++ b/testing/buildbot/chromium.clang.json
@@ -8130,7 +8130,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -8174,7 +8173,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -8262,7 +8260,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -8349,7 +8346,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -8394,7 +8390,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -8439,7 +8434,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -8484,7 +8478,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -8744,7 +8737,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -8874,7 +8866,6 @@
"os": "Android"
}
],
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -8961,7 +8952,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -9263,7 +9253,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -9350,7 +9339,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -9394,7 +9382,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -9438,7 +9425,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -9526,7 +9512,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -9871,7 +9856,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -10799,7 +10783,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -10886,7 +10869,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -10973,7 +10955,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -11018,7 +10999,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -11063,7 +11043,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -11108,7 +11087,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -11368,7 +11346,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -11498,7 +11475,6 @@
"os": "Android"
}
],
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -11585,7 +11561,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -11887,7 +11862,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -11974,7 +11948,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -12018,7 +11991,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -12062,7 +12034,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -12150,7 +12121,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -12495,7 +12465,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 75eb7d2..150586e 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -549,7 +549,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -636,7 +635,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -723,7 +721,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -768,7 +765,6 @@
"os": "Android"
}
],
- "hard_timeout": 1500,
"output_links": [
{
"link": [
@@ -813,7 +809,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -858,7 +853,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1118,7 +1112,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -1248,7 +1241,6 @@
"os": "Android"
}
],
- "hard_timeout": 120,
"output_links": [
{
"link": [
@@ -1335,7 +1327,6 @@
"os": "Android"
}
],
- "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -1637,7 +1628,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
@@ -1724,7 +1714,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -1768,7 +1757,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -1812,7 +1800,6 @@
"os": "Android"
}
],
- "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -1900,7 +1887,6 @@
"os": "Android"
}
],
- "hard_timeout": 300,
"output_links": [
{
"link": [
@@ -2245,7 +2231,6 @@
"os": "Android"
}
],
- "hard_timeout": 900,
"output_links": [
{
"link": [
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index b47c4b6..d9955b0 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -246,22 +246,16 @@
'breakpad_unittests': {},
'content_shell_test_apk': {
'swarming': {
- 'hard_timeout': 960,
'shards': 3,
},
},
'chrome_public_test_apk': {
'swarming': {
- 'hard_timeout': 1500,
'shards': 20,
},
},
'chrome_public_test_vr_apk': {},
- 'chrome_sync_shell_test_apk': {
- 'swarming': {
- 'hard_timeout': 960,
- },
- },
+ 'chrome_sync_shell_test_apk': {},
'gl_tests': {
# TODO(kbr): these are actually run on many of the GPU bots, which have
# physical hardware for several of the desktop OSs. Once the GPU JSON
@@ -273,15 +267,8 @@
# physical hardware for several of the desktop OSs. Once the GPU JSON
# generation script is merged with this one, this should be promoted from
# the Android-specific section.
- 'android_swarming': {
- 'hard_timeout': 120,
- },
},
- 'mojo_test_apk': {
- 'swarming': {
- 'hard_timeout': 300,
- },
- },
+ 'mojo_test_apk': {},
'ui_android_unittests': {},
'webview_instrumentation_test_apk': {
'swarming': {
@@ -498,19 +485,16 @@
'components_browsertests': {},
'components_unittests': {
'android_swarming': {
- 'hard_timeout': 900,
'shards': 2,
},
},
'content_browsertests': {
'android_swarming': {
- 'hard_timeout': 1500,
'shards': 9,
},
},
'content_unittests': {
'android_swarming': {
- 'hard_timeout': 960,
'shards': 3,
},
},
@@ -519,39 +503,22 @@
'gcm_unit_tests': {},
'gin_unittests': {},
'google_apis_unittests': {},
- 'gpu_unittests': {
- 'android_swarming': {
- 'hard_timeout': 960,
- },
- },
+ 'gpu_unittests': {},
'ipc_tests': {},
'libjingle_xmpp_unittests': {},
'jingle_unittests': {},
'latency_unittests': {},
'media_blink_unittests': {},
'media_service_unittests': {},
- 'media_unittests': {
- 'android_swarming': {
- 'hard_timeout': 900,
- },
- },
+ 'media_unittests': {},
'midi_unittests': {},
- 'mojo_unittests': {
- 'android_swarming': {
- 'hard_timeout': 300,
- },
- },
+ 'mojo_unittests': {},
'net_unittests': {
'android_swarming': {
- 'hard_timeout': 1800,
'shards': 3,
},
},
- 'services_unittests': {
- 'android_swarming': {
- 'hard_timeout': 300,
- },
- },
+ 'services_unittests': {},
'shell_dialogs_unittests': {},
'skia_unittests': {},
'sql_unittests': {},
@@ -564,21 +531,12 @@
},
'chromium_gtests_for_devices_with_graphical_output': {
- 'cc_unittests': {
- 'android_swarming': {
- 'hard_timeout': 900,
- },
- },
+ 'cc_unittests': {},
'device_unittests': {},
'display_unittests': {},
- 'gfx_unittests': {
- 'android_swarming': {
- 'hard_timeout': 900,
- },
- },
+ 'gfx_unittests': {},
'unit_tests': {
'android_swarming': {
- 'hard_timeout': 900,
'shards': 5,
},
},
@@ -864,31 +822,11 @@
},
'cronet_gtests': {
- 'cronet_sample_test_apk': {
- 'swarming': {
- 'hard_timeout': 300,
- },
- },
- 'cronet_smoketests_missing_native_library_instrumentation_apk': {
- 'swarming': {
- 'hard_timeout': 300,
- },
- },
- 'cronet_smoketests_platform_only_instrumentation_apk': {
- 'swarming': {
- 'hard_timeout': 300,
- },
- },
- 'cronet_test_instrumentation_apk': {
- 'swarming': {
- 'hard_timeout': 600,
- },
- },
- 'cronet_unittests_android': {
- 'swarming': {
- 'hard_timeout': 300,
- },
- },
+ 'cronet_sample_test_apk': {},
+ 'cronet_smoketests_missing_native_library_instrumentation_apk': {},
+ 'cronet_smoketests_platform_only_instrumentation_apk': {},
+ 'cronet_test_instrumentation_apk': {},
+ 'cronet_unittests_android': {},
'net_unittests': {
'swarming': {
'shards': 4,
