Bug 1267712 - Enable build automation on the autoland repo, r=kmoir
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -57,17 +57,17 @@ BRANCHES = {
},
'lock_platforms': True,
},
'try': {
'coallesce_jobs': False,
},
}
-TWIGS = [x for x in ACTIVE_PROJECT_BRANCHES if x not in ('mozilla-inbound', 'fx-team', 'larch')]
+TWIGS = [x for x in ACTIVE_PROJECT_BRANCHES if x not in ('mozilla-inbound', 'fx-team', 'larch', 'autoland')]
setMainFirefoxVersions(BRANCHES)
# Talos
PLATFORMS = {
'linux': {},
'linux64': {},
'linux64-asan': {},
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -30,16 +30,17 @@ BRANCH_PRIORITIES = {
'mozilla-esr45': 1,
'mozilla-beta': 2,
'comm-beta': 2,
'mozilla-central': 3,
'comm-central': 3,
'mozilla-aurora': 3,
'comm-aurora': 3,
# Unlisted branches are prioritized at this level
+ 'autoland': 4,
'mozilla-inbound': 4,
'fx-team': 4,
'try': 5,
'try-comm-central': 5,
'alder': 5,
# Bug 1252292 - Ash being used as a "production" branch for e10s tests
'ash': 3,
'birch': 5,
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -56,16 +56,27 @@ PROJECT_BRANCHES = {
'slave_platforms': ['yosemite_r7'],
},
'win32': {},
'win32-debug': {},
'win64': {},
'win64-debug': {},
},
},
+ 'autoland': {
+ 'merge_builds': False,
+ 'repo_path': 'integration/autoland',
+ 'enable_perproduct_builds': True,
+ 'mozconfig_dir': 'mozilla-central',
+ 'pgo_strategy': 'periodic',
+ 'talos_suites': {
+ 'xperf': 1,
+ },
+ 'branch_projects': ['spidermonkey_tier_1', 'spidermonkey_info'],
+ },
#'birch': {}, # Bug 1010674
#'cedar': {}, # Bug 1272005
'cypress': {
'lock_platforms': True,
'platforms': {
# Limit Firefox to none for Bug 787208
},
},