bug 1351272 - enable green windows 7 tests on taskcluster at tier 2; …

…r=jmaher MozReview-Commit-ID: EmJokcC2KE1
Brli · Mar 28, 2017 · 6d39fa5 · 6d39fa5
1 parent 4c2f0c8
commit 6d39fa5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 29 deletions.
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
@@ -117,25 +117,25 @@ windows7-32-vm/opt:
         - external-media-tests-slow
 
 # win32 gpu
-#windows7-32/debug:
-#    build-platform: win32/debug
-#    test-sets:
-#        - windows-gpu-tests
-#windows7-32/opt:
-#    build-platform: win32/opt
-#    test-sets:
-#        - windows-gpu-tests
+windows7-32/debug:
+    build-platform: win32/debug
+    test-sets:
+        - windows-gpu-tests
+windows7-32/opt:
+    build-platform: win32/opt
+    test-sets:
+        - windows-gpu-tests
 
 # win64 vm
 windows10-64-vm/debug:
     build-platform: win64/debug
     test-sets:
-        - windows-vm-tests
+#        - windows-vm-tests
         - external-media-tests
 windows10-64-vm/opt:
     build-platform: win64/opt
     test-sets:
-        - windows-vm-tests
+#        - windows-vm-tests
         - external-media-tests
         - external-media-tests-slow
 

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
@@ -127,24 +127,24 @@ jsdcov-code-coverage-tests:
 
 windows-vm-tests:
     - cppunit
-    #- crashtest
-    #- gtest
-    #- jittest
+    - crashtest
+    - gtest
+    - jittest
     - jsreftest
-    #- marionette
-    #- mochitest
-    #- mochitest-browser-chrome
+    - marionette
+    - mochitest
+    - mochitest-browser-chrome
     - mochitest-devtools-chrome
     - mochitest-jetpack
-    #- mochitest-media
-    #- web-platform-tests
+    - mochitest-media
+    - web-platform-tests
     - web-platform-tests-reftests
     #- xpcshell
 
-# windows-gpu-tests:
-#    - reftest
-#    - reftest-no-accel
-#    - mochitest-webgl
+windows-gpu-tests:
+    - reftest
+    - reftest-no-accel
+    - mochitest-webgl
 
 # these tests currently run on hardware, but may migrate above when validated
 #    - mochitest-a11y

diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
@@ -873,6 +873,7 @@ mochitest-webgl:
     loopback-video: true
     max-run-time:
         by-test-platform:
+            windows.*: 5400
             android.*: 7200
             default: 3600
     instance-size:
@@ -979,6 +980,8 @@ reftest:
             default: 3600
     e10s:
         by-test-platform:
+            # bug 1351272
+            windows7-32/debug: false
             macosx.*: true
             default: both
     mozharness:
@@ -1023,6 +1026,11 @@ reftest-no-accel:
         by-test-platform:
             macosx.*: 1
             default: 8
+    e10s:
+        by-test-platform:
+            # bug 1351272
+            windows7-32/debug: false
+            default: both
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true

diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
@@ -274,11 +274,11 @@
 
     # the product name, defaults to firefox
     Optional('product'): basestring,
-
-    # conditional files to determine when these tests should be run
-    Optional('when'): Any({
-        Optional('files-changed'): [basestring],
-    }),
+
+    # conditional files to determine when these tests should be run
+    Optional('when'): Any({
+        Optional('files-changed'): [basestring],
+    }),
 
 }, required=True)
 
@@ -420,8 +420,7 @@ def set_tier(config, tests):
                                          'android-4.3-arm7-api-15/debug',
                                          'android-4.2-x86/opt']:
                 test['tier'] = 1
-            elif test['test-platform'].startswith('windows') \
-                    or test['worker-implementation'] == 'native-engine':
+            elif test['worker-implementation'] == 'native-engine':
                 test['tier'] = 3
             else:
                 test['tier'] = 2