Merge default -> production production
authorJustin Wood <Callek@gmail.com>
Thu, 12 Oct 2017 14:23:02 -0400
branchproduction
changeset 15555 40289a691194e9bf5d43ff095512b328355dd48b
parent 15552 61aaf01c266649ca47683948565a3983e38a81e1 (current diff)
parent 15554 846dffdeb159765afae73b4e6fbbad4c4f749234 (diff)
child 15556 50c092ff0e044a8df3be8b4c2d0e1762b0105b8b
push id10935
push userCallek@gmail.com
push dateThu, 12 Oct 2017 18:23:39 +0000
Merge default -> production MozReview-Commit-ID: 53EgLx6NrwU
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -516,16 +516,26 @@ SUITES = {
         'suites': GRAPH_CONFIG + ['--activeTests', 'speedometer'],
         'options': ({}, ALL_TALOS_PLATFORMS),
     },
     'speedometer-stylo-disabled-e10s': {
         'enable_by_default': False,
         'suites': GRAPH_CONFIG + ['--activeTests', 'speedometer'],
         'options': ({}, ALL_TALOS_PLATFORMS),
     },
+    'h1-e10s': {
+        'enable_by_default': False,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'ts_paint_heavy'],
+        'options': ({}, ALL_TALOS_PLATFORMS),
+    },
+    'h2-e10s': {
+        'enable_by_default': False,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tp6_google_heavy:tp6_youtube_heavy:tp6_amazon_heavy:tp6_facebook_heavy'],
+        'options': ({}, ALL_TALOS_PLATFORMS),
+    },
 }
 
 BRANCH_UNITTEST_VARS = {
     'hghost': 'hg.mozilla.org',
     # turn on platforms as we get them running
     'platforms': {
         'linux': {},
         'linux64': {},
@@ -2885,22 +2895,24 @@ for platform in PLATFORMS.keys():
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
                         MOCHITEST_GPU + MOCHITEST_CLIPBOARD
 
                     # Do not add Linux x64 debug since it is running on TaskCluster
                     if slave_platform != 'ubuntu64_vm':
                         BRANCHES[name]['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
                             MOCHITEST_GPU + MOCHITEST_CLIPBOARD
 
-# Enable talos speedometer on 58+
+# Enable talos h1, h2, and speedometer on 58+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 58):
     if branch.get('enable_talos') is False:
         continue
     branch['speedometer-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
     branch['speedometer-stylo-disabled-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
+    branch['h1-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
+    branch['h2-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 
 # Enable talos Stylo on 57+ for m-c and try
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 57):
     if branch.get('enable_talos') is False:
         continue
     if name in ['try', 'mozilla-central']:
         branch['xperf-stylo-e10s_tests'] = (1, False, {}, WIN7_ONLY)
         branch['xperf-stylo-disabled-e10s_tests'] = (1, False, {}, WIN7_ONLY)
--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -54,33 +54,39 @@ reload(passwords)
 def builder_filter(bname, builder_name):
     if bname not in builder_name:
         return True
     return False
 
 # get list of branches to disable buildbot opt builds for
 # Bug 1353376 - Turn off buildbot macosx64 opt builds scheduling
 # Bug 1373282 - mac dev edition builds and tests will be scheduled via bbb
+# Bug 1402457 - run periodic file updates via TC
 disable_osx_sched = []
 disable_win_sched = []
+disable_periodic_file_sched = []
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 55):
     disable_osx_sched.append(name)
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 56):
     if name != "try":
         disable_win_sched.append(name)
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 58):
+    disable_periodic_file_sched.append(name)
 
 for branch in ACTIVE_BRANCHES:
     branchObjects = generateBranchObjects(BRANCHES[branch], branch,
             getattr(passwords, 'secrets', None))
     for s in branchObjects.get('schedulers', [])[:]:
         # builder names to be deleted
         if not s.builderNames:
             continue
 
         bnames = []
+        if branch in disable_periodic_file_sched:
+            bnames.extend(['daily-' + branch])
         if branch in disable_osx_sched:
             bnames.extend(['OS X 10.7 ' + branch + " build", 'OS X 10.7 ' + branch + " devedition build"])
         if branch in disable_win_sched:
             bnames.extend([
                 'WINNT 5.2 ' + branch + " build",
                 'WINNT 5.2 ' + branch + " leak test build",
                 'WINNT 5.2 ' + branch + " pgo-build",
                 'WINNT 5.2 ' + branch + " devedition build",
--- a/mozilla/universal_master_sqlite.cfg
+++ b/mozilla/universal_master_sqlite.cfg
@@ -72,43 +72,51 @@ reload(passwords)
 def builder_filter(bname, builder_name):
     if bname not in builder_name:
         return True
     return False
 
 # get list of branches to disable buildbot opt builds for
 # Bug 1353376 - Turn off buildbot macosx64 opt builds scheduling
 # Bug 1373282 - mac dev edition builds and tests will be scheduled via bbb
+# Bug 1402457 - run periodic file updates via TC
 disable_osx_sched = []
 disable_win_sched = []
+disable_periodic_file_sched = []
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 55):
     disable_osx_sched.append(name)
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 56):
     if name != "try":
         disable_win_sched.append(name)
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 58):
+    disable_periodic_file_sched.append(name)
 
 for branch in ACTIVE_BRANCHES:
     branchObjects = generateBranchObjects(BRANCHES[branch], branch,
             getattr(passwords, 'secrets', None))
     for s in branchObjects.get('schedulers', [])[:]:
         if not s.builderNames:
             continue
 
         # builder names to be deleted
         bnames = []
+        if branch in disable_periodic_file_sched:
+            bnames.extend(['daily-' + branch])
         if branch in disable_osx_sched:
             bnames.extend(['OS X 10.7 ' + branch + " build", 'OS X 10.7 ' + branch + " devedition build"])
         if branch in disable_win_sched:
             bnames.extend([
                 'WINNT 5.2 ' + branch + " build",
                 'WINNT 5.2 ' + branch + " leak test build",
                 'WINNT 5.2 ' + branch + " pgo-build",
+                'WINNT 5.2 ' + branch + " devedition build",
                 'WINNT 6.1 x86-64 ' + branch + " build",
                 'WINNT 6.1 x86-64 ' + branch + " pgo-build",
                 'WINNT 6.1 x86-64 ' + branch + " leak test build",
+                'WINNT 6.1 x86-64 ' + branch + " devedition build",
             ])
         for bname in bnames:
             pre = s.builderNames
             s.builderNames = [b for b in s.builderNames if builder_filter(bname, b)]
             post = s.builderNames
             # builder name to be deleted
             if bname in set(pre) - set(post):
                 assert len(set(pre) - set(post)) == 1