Bug 1321776 - enable green tc win tests on tier 3. r=jmaher
authorRob Thijssen <rthijssen@mozilla.com>
Fri, 02 Dec 2016 11:24:42 +0000
changeset 325138 0bce5824035d59d1bdc3602dc272a6bfb4e80fe5
parent 325114 1f7832017dbb5c53ba00aef3012b40c873a5005d
child 325139 99c9d215e0b8d6ea51ba156a64138e014338fb11
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersjmaher
bugs1321776
milestone53.0a1
Bug 1321776 - enable green tc win tests on tier 3. r=jmaher MozReview-Commit-ID: 5IpUMcEfZBH
taskcluster/ci/desktop-test/test-sets.yml
taskcluster/ci/desktop-test/tests.yml
taskcluster/taskgraph/transforms/tests/all_kinds.py
taskcluster/taskgraph/transforms/tests/test_description.py
--- a/taskcluster/ci/desktop-test/test-sets.yml
+++ b/taskcluster/ci/desktop-test/test-sets.yml
@@ -95,25 +95,25 @@ asan-tests:
     - xpcshell
 
 windows-vm-tests:
     - cppunit
     #- crashtest
     - external-media-tests
     #- gtest
     #- jittest
-    #- jsreftest
+    - jsreftest
     #- marionette
     #- mochitest
     #- mochitest-browser-chrome
-    #- mochitest-devtools-chrome
-    #- mochitest-jetpack
+    - mochitest-devtools-chrome
+    - mochitest-jetpack
     #- mochitest-media
     #- web-platform-tests
-    #- web-platform-tests-reftests
+    - web-platform-tests-reftests
     #- xpcshell
 
 # windows-gpu-tests:
 #    - reftest
 #    - reftest-no-accel
 #    - mochitest-webgl
 
 # these tests currently run on hardware, but may migrate above when validated
--- a/taskcluster/ci/desktop-test/tests.yml
+++ b/taskcluster/ci/desktop-test/tests.yml
@@ -152,16 +152,21 @@ jittest:
 jsreftest:
     description: "JS Reftest run"
     suite: reftest/jsreftest
     treeherder-symbol: tc-R(J)
     chunks:
         by-test-platform:
             win.*: 1
             default: 2
+    e10s:
+        by-test-platform:
+            # Bug 1321782
+            win.*: false
+            default: both
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 win.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
@@ -384,16 +389,18 @@ mochitest-devtools-chrome:
             linux64-jsdcov/opt: []
             default: ['all']
     e10s:
         by-test-platform:
             # Bug 1242986: linux64/debug mochitest-devtools-chrome e10s is not greened up yet
             linux64/debug: false
             linux64-ccov/opt: false
             linux64-jsdcov/opt: false
+            # Bug 1304433: mochitest-devtools-chrome (e10s) not greened on windows
+            win.*: false
             default: both
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 win.*:
                     - unittests/win_taskcluster_unittest.py
@@ -661,16 +668,21 @@ web-platform-tests:
             - --test-type=testharness
 
 web-platform-tests-reftests:
     description: "Web platform reftest run"
     suite: web-platform-tests-reftests
     treeherder-symbol: tc-W(Wr)
     max-run-time: 5400
     instance-size: xlarge
+    e10s:
+        by-test-platform:
+            # Bug 1304438
+            win.*: false
+            default: both
     docker-image: {"in-tree": "desktop1604-test"}
     checkout: true
     mozharness:
         script: web_platform_tests.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 win.*:
--- a/taskcluster/taskgraph/transforms/tests/all_kinds.py
+++ b/taskcluster/taskgraph/transforms/tests/all_kinds.py
@@ -42,16 +42,18 @@ def set_tier(config, tests):
     for test in tests:
         # only override if not set for the test
         if 'tier' not in test:
             if test['test-platform'] in ['linux64/debug',
                                          'linux64-asan/opt',
                                          'android-4.3-arm7-api-15/debug',
                                          'android-x86/opt']:
                 test['tier'] = 1
+            elif test['test-platform'].startswith('win'):
+                test['tier'] = 3
             else:
                 test['tier'] = 2
         yield test
 
 
 @transforms.add
 def set_expires_after(config, tests):
     """Try jobs expire after 2 weeks; everything else lasts 1 year.  This helps
@@ -86,16 +88,17 @@ def resolve_keyed_by(config, tests):
     """Resolve fields that can be keyed by platform, etc."""
     fields = [
         'instance-size',
         'max-run-time',
         'chunks',
         'e10s',
         'suite',
         'run-on-projects',
+        'tier',
     ]
     for test in tests:
         for field in fields:
             test[field] = get_keyed_by(item=test, field=field, item_name=test['test-name'])
         test['mozharness']['config'] = get_keyed_by(item=test,
                                                     field='mozharness',
                                                     subfield='config',
                                                     item_name=test['test-name'])
--- a/taskcluster/taskgraph/transforms/tests/test_description.py
+++ b/taskcluster/taskgraph/transforms/tests/test_description.py
@@ -61,17 +61,20 @@ test_description_schema = Schema({
     # projects on which this task should be included in the target task set.
     # See the attributes documentation for details.
     Optional('run-on-projects', default=['all']): Any(
         [basestring],
         {'by-test-platform': {basestring: [basestring]}},
     ),
 
     # the sheriffing tier for this task (default: set based on test platform)
-    Optional('tier'): int,
+    Optional('tier'): Any(
+        int,
+        {'by-test-platform': {basestring: int}},
+    ),
 
     # number of chunks to create for this task.  This can be keyed by test
     # platform by passing a dictionary in the `by-test-platform` key.  If the
     # test platform is not found, the key 'default' will be tried.
     Required('chunks', default=1): Any(
         int,
         {'by-test-platform': {basestring: int}},
     ),