Bug 1583695 - Adjust Android test timeouts; r=bc

Change the taskcluster max-run-time for mochitests and reftests to use the
defaults, now that android tests no longer run anywhere near 7200 seconds.
(Also noticed some unrelated tc configuration that is obsolete - tidied that.)
Also remove the special 600 second reftest timeout for android debug reftests.

Differential Revision: https://phabricator.services.mozilla.com/D47301

--HG--
extra : moz-landing-system : lando

layout/tools/reftest/remotereftest.py

@@ -16,7 +16,6 @@ import urllib2
 from contextlib import closing
 
 from mozdevice import ADBDevice, ADBTimeoutError
-import mozinfo
 from automation import Automation
 from remoteautomation import RemoteAutomation, fennecLogcatFilters
 
@@ -397,11 +396,6 @@ def run_test_harness(parser, options):
     parser.validate_remote(options, reftest.automation)
     parser.validate(options, reftest)
 
-    if mozinfo.info['debug']:
-        print("changing timeout for remote debug reftests from %s to 600 seconds"
-              % options.timeout)
-        options.timeout = 600
-
     # Hack in a symbolic link for jsreftest
     os.system("ln -s ../jsreftest " + str(os.path.join(SCRIPT_DIRECTORY, "jsreftest")))
 

taskcluster/ci/test/mochitest.yml

@@ -60,10 +60,7 @@ mochitest:
             macosx.*64-ccov/debug: 10
             default: 5
     e10s: true
-    max-run-time:
-        by-test-platform:
-            android-em.*: 7200
-            default: 5400
+    max-run-time: 5400
     allow-software-gl-layers: false
     mozharness:
         mochitest-flavor: plain
@@ -170,29 +167,17 @@ mochitest-chrome:
             default: default
     chunks:
         by-test-platform:
-            android-em-7.*: 1
             .*-ccov/.*: 3
             .*-qr/.*: 3
             .*-asan/opt: 3
             (linux64|windows.*-..|macosx10..)/debug: 3
             windows10-aarch64/.*: 3
             default: 2
-    max-run-time:
-        by-test-platform:
-            android-em.*: 7200
-            default: 3600
+    max-run-time: 3600
     e10s: false
     mozharness:
         mochitest-flavor: chrome
-        extra-options:
-            by-test-platform:
-                android-em.*:
-                    - --test-suite=mochitest-chrome
-                default: []
-        chunked:
-            by-test-platform:
-                android-em.*: false
-                default: true
+        chunked: true
 
 mochitest-devtools-chrome:
     description: "Mochitest devtools-chrome run"

taskcluster/ci/test/reftest.yml

@@ -50,10 +50,7 @@ crashtest:
             android-em-7.*: 1
             default: 1
     e10s: true
-    max-run-time:
-        by-test-platform:
-            android-em.*: 7200
-            default: 3600
+    max-run-time: 3600
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
@@ -81,7 +78,6 @@ jsreftest:
             default: 3
     max-run-time:
         by-test-platform:
-            android-em.*: 7200
             windows10-64-ccov/debug: 7200
             macosx.*64-ccov/debug: 7200
             linux.*64-ccov/debug: 7200
@@ -115,7 +111,6 @@ reftest:
     e10s: true
     max-run-time:
         by-test-platform:
-            android-em.*: 7200
             windows7-32-mingwclang/debug: 5400
             windows10-64-ccov/debug: 5400
             windows10-64-asan/opt: 5400