Bug 1449587 - change the chunks that reftests run in to complete in more realistic runtimes and balance overhead + test time. r=ahal, a=test-only
authorJoel Maher <jmaher@mozilla.com>
Fri, 30 Mar 2018 06:06:42 -0400
changeset 460564 cbcda4b377785c4115db071de321aceb7c959cda
parent 460563 2ad3b36efccaa78496a4ff5997a70820667b75d2
child 460565 525f37e3a399becabd44b4c7cdb3f5b6424ced0e
push id8984
push userryanvm@gmail.com
push dateThu, 05 Apr 2018 00:13:08 +0000
treeherdermozilla-beta@fb0f35c060ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal, test-only
bugs1449587
milestone60.0
Bug 1449587 - change the chunks that reftests run in to complete in more realistic runtimes and balance overhead + test time. r=ahal, a=test-only
taskcluster/ci/test/reftest.yml
taskcluster/taskgraph/transforms/tests.py
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -96,18 +96,18 @@ reftest:
             windows10.*: hardware
             default: virtual-with-gpu
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 56
             android.*: 28
             macosx64.*/opt: 1
             macosx64.*/debug: 3
-            windows10-64.*/opt: 1
-            windows10-64.*/debug: 2
+            windows.*/opt: 2
+            windows.*/debug: 4
             default: 8
     e10s:
         by-test-platform:
             linux32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             android.*: 7200
@@ -124,17 +124,20 @@ reftest:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest-gpu:
     description: "Reftest GPU run"
     suite: reftest/reftest-gpu
     treeherder-symbol: R(Rg)
-    chunks: 8
+    chunks:
+        by-test-platform:
+            windows.*/opt: 2
+            default: 4
     run-on-projects:
         by-test-platform:
             windows10.*: []
             default: built-projects
     instance-size: default
     virtualization: virtual-with-gpu
     max-run-time: 3600
     mozharness:
@@ -148,16 +151,17 @@ reftest-no-accel:
     virtualization: virtual-with-gpu
     run-on-projects:
         by-test-platform:
             windows10.*: []
             default: built-projects
     chunks:
         by-test-platform:
             macosx.*: 1
+            windows.*: 4
             default: 8
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             default: true
     mozharness:
         chunked:
             by-test-platform:
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -791,25 +791,16 @@ def split_chunks(config, tests):
     them and assigning 'this-chunk' appropriately and updating the treeherder
     symbol."""
     for test in tests:
         if test['chunks'] == 1:
             test['this-chunk'] = 1
             yield test
             continue
 
-        # HACK: Bug 1373578 appears to pass with more chunks, non-e10s only though
-        if test['test-platform'] == 'windows7-32/debug' and test['test-name'] == 'reftest':
-            test['chunks'] = 32
-
-        if (test['test-platform'] == 'windows7-32/opt' or
-            test['test-platform'] == 'windows7-32-pgo/opt') and \
-                test['test-name'] in ['reftest-e10s', 'reftest-no-accel-e10s', 'reftest-gpu-e10s']:
-            test['chunks'] = 32
-
         for this_chunk in range(1, test['chunks'] + 1):
             # copy the test and update with the chunk number
             chunked = copy.deepcopy(test)
             chunked['this-chunk'] = this_chunk
 
             # add the chunk number to the TH symbol
             group, symbol = split_symbol(chunked['treeherder-symbol'])
             symbol += str(this_chunk)