Merge from default production
authorNick Thomas <nthomas@mozilla.com>
Fri, 28 Jul 2017 12:41:25 +1200
branchproduction
changeset 15347 534f8494d95bf8e7730f75c44c9cf62439474d51
parent 15343 a068d9db71eb2e88eb225afeec3862937b64e7f9 (current diff)
parent 15346 075e8cd5adc1844adf94b4a8d5ef057d6584b7e2 (diff)
child 15351 a3ca775b74742d8ffc96e9fb027879f0b5b6ced5
push id10780
push usernthomas@mozilla.com
push dateFri, 28 Jul 2017 00:41:37 +0000
Merge from default
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -229,20 +229,20 @@ for platform, platform_config in PLATFOR
                               platform_config.get('talos_slave_platforms', []))
     for slave_platform in all_slave_platforms:
         platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
         if slave_platform in TRY_SLAVES:
             platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
         else:
             platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
-ALL_TALOS_PLATFORMS = get_talos_slave_platforms(PLATFORMS, platforms=('linux64', 'win32', 'win32-devedition', 'macosx64', 'macosx64-devedition', 'win64', 'win64-devedition', 'linux64-stylo', 'linux64-stylosequential', 'linux64-devedition'))
-LINUX_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('linux64', 'linux64-stylo', 'linux64-stylosequential', 'linux64-devedition'))
-WIN_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('win32', 'win32-devedition', 'win64', 'win64-devedition'))
-WIN7_ONLY = ['win7_ix', 'win7_ix_devedition']
+ALL_TALOS_PLATFORMS = get_talos_slave_platforms(PLATFORMS, platforms=('linux64', 'win32', 'macosx64', 'win64', 'linux64-stylo', 'linux64-stylosequential'))
+LINUX_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('linux64', 'linux64-stylo', 'linux64-stylosequential'))
+WIN_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('win32', 'win64'))
+WIN7_ONLY = ['win7_ix']
 
 SUITES = {
     'xperf-e10s': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'tp5n', '--sampleConfig', 'xperf.config', '--mozAfterPaint', '--xperf_path',
                                   '"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"', '--filter', 'ignore_first:5', '--filter', 'median'],
         'options': (TALOS_TP_NEW_OPTS, WIN7_ONLY),
     },
@@ -306,16 +306,31 @@ SUITES = {
         'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median'],
         'options': ({}, WIN_ONLY),
     },
     'quantum-pageload-stylo-e10s': {
         'enable_by_default': True,
         'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo'],
         'options': ({}, WIN_ONLY),
     },
+    'tp6-e10s': {
+        'enable_by_default': False,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': ({}, WIN_ONLY),
+    },
+    'tp6-stylo-e10s': {
+        'enable_by_default': False,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo'],
+        'options': ({}, WIN_ONLY),
+    },
+    'tp6-stylo-threads-e10s': {
+        'enable_by_default': True,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo-threads'],
+        'options': ({}, WIN_ONLY),
+    },
     'perf-reftest-singletons-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic_singleton', '--filter', 'ignore_first:5', '--filter', 'median'],
         'options': ({}, ALL_TALOS_PLATFORMS),
     },
 }
 
 BRANCH_UNITTEST_VARS = {
@@ -2510,16 +2525,21 @@ for platform in PLATFORMS.keys():
                             MOCHITEST_GPU + MOCHITEST_CLIPBOARD
 
 # Enable talos perf-reftest-singeltons on 56+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 56):
     if branch.get('enable_talos') is False:
         continue
     branch['perf-reftest-singletons-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
     branch['quantum-pageload-stylo-e10s_tests'] = (1, False, {}, WIN_ONLY)
+    branch['tp6-stylo-threads-e10s_tests'] = (1, False, {}, WIN_ONLY)
+
+    if name in ['try']:
+        branch['tp6-stylo-e10s_tests'] = (1, False, {}, WIN_ONLY)
+        branch['tp6-e10s_tests'] = (1, False, {}, WIN_ONLY)
 
 ### Test suites that only run on Try ###
 
 ride_trains_branches = []
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
     ride_trains_branches.append(name)
 
 # TALOS: If you set 'talos_slave_platforms' for a branch you will only get that subset of platforms
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -193,16 +193,17 @@ PROJECT_BRANCHES = {
         # temp balrog
         'balrog_api_root': 'http://ec2-54-196-167-74.compute-1.amazonaws.com:7070/api',
         'funsize_balrog_api_root': 'http://ec2-54-196-167-74.compute-1.amazonaws.com:7070/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
         'bouncer_submitter_config': {
             "firefox": "releases/bouncer_firefox_beta.py",
             "devedition": "releases/bouncer_firefox_devedition.py",
         },
+        'binary_transparency_enabled': True,
         'bouncer_enabled': True,
         'updates_builder_enabled': True,
         'update_verify_enabled': True,
         'postrelease_version_bump_enabled': {
             "firefox": True,
             "devedition": False,
             "fennec": True,
         },