Bug 1313499 - Schedule reftest-gpu-e10s for Win7 on Try. r=rail
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 07 Nov 2016 18:07:22 -0500
changeset 14666 6b8d9baf752fedb40abb0bb159e6cf3e544d21de
parent 14665 290ca746ca3fbcb4d42c1c8d81265cc07ea72093
child 14667 7dc0f10cc95f961748d9e01cf3d9fe5f16685720
child 14668 62f2a76d07ce6bc634d7066afa46bff915988a57
push id10283
push userryanvm@gmail.com
push dateMon, 07 Nov 2016 23:07:46 +0000
reviewersrail
bugs1313499
Bug 1313499 - Schedule reftest-gpu-e10s for Win7 on Try. r=rail
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -768,16 +768,26 @@ REFTEST_FOUR_CHUNKS = [
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--reftest-suite', 'reftest'],
         'blob_upload': True,
         'script_maxtime': 7200,
         'totalChunks': 4,
     }),
 ]
 
+REFTEST_GPU_E10S = [
+    ('reftest-gpu-e10s', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'reftest-gpu', '--e10s'],
+        'blob_upload': True,
+        'script_maxtime': 7200,
+    }),
+]
+
 REFTEST_NOACCEL = [
     ('reftest-no-accel', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--reftest-suite', 'reftest-no-accel'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
@@ -2120,16 +2130,19 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-e10s': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'reftest-gpu-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-no-accel-e10s': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'web-platform-tests': {
                     'config_files': ["web_platform_tests/prod_config_windows.py"],
@@ -3562,16 +3575,30 @@ for name, branch in items_at_least(BRANC
     if 'win7_vm' in win32:
         win32['win7_vm']['opt_unittest_suites'] = WORKING_WIN7_AWS_OPT_SUITES + MOCHITEST_WO_BC + MOCHITEST_E10S + MOCHITEST_BC_7_E10S + MOCHITEST_BC_7
         win32['win7_vm']['debug_unittest_suites'] = WORKING_WIN7_AWS_DEBUG_SUITES + MOCHITEST_WO_BC + MOCHITEST_E10S + MOCHITEST_BC_7_E10S + MOCHITEST_BC_7
 
     if 'win7_vm_gfx' in win32:
         win32['win7_vm_gfx']['opt_unittest_suites'] += MOCHITEST_WEBGL_CHUNKED + MOCHITEST_WEBGL_CHUNKED_E10S + REFTEST_NOACCEL_E10S
         win32['win7_vm_gfx']['debug_unittest_suites'] += MOCHITEST_WEBGL_CHUNKED + MOCHITEST_WEBGL_CHUNKED_E10S + REFTEST_NOACCEL_E10S
 
+# Bug 1313499 - Run reftest-gpu-e10s on AWS on Try only initially
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 52):
+    # Skip branches where win32 isn't running
+    if not nested_haskey(branch, 'platforms', 'win32'):
+        continue
+    win32 = branch['platforms']['win32']
+
+    if name != 'try':
+        continue
+
+    if 'win7_vm_gfx' in win32:
+        win32['win7_vm_gfx']['opt_unittest_suites'] += REFTEST_GPU_E10S
+        win32['win7_vm_gfx']['debug_unittest_suites'] += REFTEST_GPU_E10S
+
 ###
 # Bug 1269543 - Stop running tests on OS X 10.6 on Firefox 49+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 49):
     if name in ['try']:
         continue
     for platform in branch['platforms'].keys():
         if platform not in ['macosx64']:
             continue