Bug 1308544 - Enable automation jobs on Cedar twig, r=kmoir
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3605,16 +3605,27 @@ for name, branch in items_at_least(BRANC
for i in ['opt_unittest_suites', 'debug_unittest_suites']:
if MOCHITEST_WEBGL[0] in branch['platforms'][platform][slave_platform][i]:
branch['platforms'][platform][slave_platform][i] = [item for item in branch['platforms'][platform][slave_platform][i] if item not in MOCHITEST_WEBGL]
branch['platforms'][platform][slave_platform][i] += MOCHITEST_WEBGL_CHUNKED
if MOCHITEST_WEBGL_E10S[0] in branch['platforms'][platform][slave_platform][i]:
branch['platforms'][platform][slave_platform][i] = [item for item in branch['platforms'][platform][slave_platform][i] if item not in MOCHITEST_WEBGL_E10S]
branch['platforms'][platform][slave_platform][i] += MOCHITEST_WEBGL_CHUNKED_E10S
+# Bug 1308544 - Enable automation jobs on Cedar twig
+for branch in BRANCHES.keys():
+ if branch not in ['cedar']:
+ continue
+ for test in ['opt_unittest_suites', 'debug_unittest_suites']:
+ for platform in BRANCHES[branch]['platforms'].keys():
+ BRANCHES[branch]['platforms']['win64']['win8_64'][test] = [item for item in BRANCHES[branch]['platforms']['win64']['win8_64'][test] if (item[0].startswith('mochitest') or item in XPCSHELL)]
+ BRANCHES[branch]['platforms']['macosx64']['yosemite_r7'][test] = [item for item in BRANCHES[branch]['platforms']['macosx64']['yosemite_r7'][test] if (item[0].startswith('mochitest') or item in XPCSHELL)]
+ if test in ['opt_unittest_suites']:
+ BRANCHES[branch]['platforms']['linux64']['ubuntu64_vm'][test] = [item for item in BRANCHES[branch]['platforms']['linux64']['ubuntu64_vm'][test] if (item[0].startswith('mochitest') or item in XPCSHELL)]
+
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0:
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -68,17 +68,37 @@ PROJECT_BRANCHES = {
'pgo_strategy': 'periodic',
'periodic_start_hours': range(0, 24, 3),
'talos_suites': {
'xperf': 1,
},
'branch_projects': ['spidermonkey_tier_1'],
},
#'birch': {}, # Bug 1010674
- #'cedar': {}, # Bug 1272005
+# Bug 1308544 - Enable automation jobs on Cedar twig
+ 'cedar': {
+ 'enable_perproduct_builds': False,
+ 'lock_platforms': True,
+ 'mozharness_tag': 'default',
+ 'enable_talos': True,
+ 'talos_suites': {
+ 'other': 1,
+ 'svgr': 1,
+ 'tp5o': 1,
+ 'other-e10s': 1,
+ 'svgr-e10s': 1,
+ 'tp5o-e10s': 1,
+ },
+ 'enable_opt_unittests': True,
+ 'platforms': {
+ 'linux64': {},
+ 'macosx64': {},
+ 'win64': {},
+ },
+ },
'cypress': {
'lock_platforms': True,
'platforms': {
# Limit Firefox to none for Bug 787208
},
},
'date': {
'enable_talos': False,