Bug 1287831 - Split TC Android debug mochitest-chrome into 2 chunks and specify chunks explicitly; r=dustin
authorGeoff Brown <gbrown@mozilla.com>
Mon, 25 Jul 2016 11:11:15 -0600
changeset 331635 0719f3b4d3659141f70ad53d9b961c5b2e81dfb5
parent 331634 e6916da8de22872b29b08999c766ffa250ceeaf4
child 331636 387964e7a8eb8f5c5c10f214fa3ec33a2aa55cfa
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1287831
milestone50.0a1
Bug 1287831 - Split TC Android debug mochitest-chrome into 2 chunks and specify chunks explicitly; r=dustin
taskcluster/ci/android-test/tests.yml
taskcluster/taskgraph/transforms/tests/android_test.py
--- a/taskcluster/ci/android-test/tests.yml
+++ b/taskcluster/ci/android-test/tests.yml
@@ -90,16 +90,20 @@ mochitest:
         extra-options:
             - --test-suite=mochitest
 
 mochitest-chrome:
     description: "Mochitest chrome run"
     suite: mochitest/chrome
     treeherder-symbol: tc-M(c)
     instance-size: xlarge
+    chunks:
+        by-test-platform:
+            android-4.3-arm7-api-15/debug: 2
+            android-4.3-arm7-api-15/opt: 1
     loopback-video: true
     e10s: false
     max-run-time: 5400
     mozharness:
         script: mozharness/scripts/android_emulator_unittest.py
         no-read-buildbot-config: true
         config:
             - mozharness/configs/android/androidarm_4_3.py
--- a/taskcluster/taskgraph/transforms/tests/android_test.py
+++ b/taskcluster/taskgraph/transforms/tests/android_test.py
@@ -46,38 +46,8 @@ def set_treeherder_machine_platform(conf
     translation = {
         'android-api-15/debug': 'android-4-3-armv7-api15/debug',
         'android-api-15/opt': 'android-4-3-armv7-api15/opt',
     }
     for test in tests:
         build_platform = test['build-platform']
         test['treeherder-machine-platform'] = translation.get(build_platform, build_platform)
         yield test
-
-
-@transforms.add
-def set_chunk_args(config, tests):
-    # Android tests do not take the --this-chunk/--total-chunk args like linux
-    # tests, preferring to define a --test-suite argument for each chunk.
-    # Where debug and opt have different chunk counts, there are *different*
-    # test-suite definitions for the debug and opt runs.
-    #
-    # Within the mozharness scripts, there is a translation *back* to
-    # --this-chunk/--total-chunk.
-    #
-    # TODO: remove the need for this with some changes to the mozharness script
-    # to take --total-chunk/this-chunk
-
-    for test in tests:
-        test['mozharness']['chunking-args'] = 'test-suite-suffix'
-
-        # if the chunks are an integer, then they do not differ between
-        # platforms, so the suffix is always "-<CHUNK>"
-        if isinstance(test['chunks'], int):
-            test['mozharness']['chunk-suffix'] = "-<CHUNK>"
-        else:
-            # otherwise, by convention, the debug version has "-debug" in the
-            # suite name and the opt version does not
-            if test['test-platform'].endswith('debug'):
-                test['mozharness']['chunk-suffix'] = '-debug-<CHUNK>'
-            else:
-                test['mozharness']['chunk-suffix'] = '-<CHUNK>'
-        yield test