bug 1156408: reconfigure alder for buildbot bridge testing. r=callek
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1539,17 +1539,18 @@ for name, branch in items_before(BRANCHE
del branch['platforms']['win32-mulet']
if 'macosx64-mulet' in branch['platforms']:
del branch['platforms']['macosx64-mulet']
# dolphin is for selected branches only
for branch in BRANCHES:
if branch not in ('mozilla-b2g30_v1_4', 'mozilla-b2g34_v2_1s',
'mozilla-aurora', 'mozilla-central',
- 'mozilla-inbound', 'b2g-inbound', 'fx-team'):
+ 'mozilla-inbound', 'b2g-inbound', 'fx-team',
+ 'alder'):
if 'dolphin' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['dolphin']
if 'dolphin_eng' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['dolphin_eng']
# dolphin-512 is for selected branches only
for branch in BRANCHES:
if branch not in ('mozilla-b2g34_v2_1s',):
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -32,16 +32,66 @@ PROJECT_BRANCHES = {
#'ux': {
# 'branch_name': 'UX',
# 'mobile_branch_name': 'UX',
# 'build_branch': 'UX',
# 'enable_nightly': True,
#},
##### TWIGS aka RENTABLE BRANCHES
'alder': {
+ 'enable_nightly': True,
+ 'platforms': {
+ 'nexus-4': {
+ 'enable_nightly': True,
+ },
+ 'nexus-4_eng': {
+ 'enable_nightly': True,
+ 'consider_for_nightly': False,
+ },
+ 'nexus-5-l': {
+ 'enable_nightly': True,
+ },
+ 'nexus-5-l_eng': {
+ 'enable_nightly': True,
+ 'consider_for_nightly': False,
+ },
+ 'flame-kk': {
+ 'enable_nightly': True,
+ },
+ 'flame-kk_eng': {
+ 'enable_nightly': True,
+ },
+ 'emulator': {
+ 'enable_nightly': True,
+ },
+ 'emulator-debug': {
+ 'enable_nightly': True,
+ },
+ 'emulator-jb': {
+ 'enable_nightly': True,
+ },
+ 'emulator-jb-debug': {
+ 'enable_nightly': True,
+ },
+ 'linux64-b2g-haz': {
+ 'enable_nightly': False,
+ },
+ 'emulator-kk': {
+ 'enable_nightly': True,
+ },
+ 'emulator-kk-debug': {
+ 'enable_nightly': True,
+ },
+ 'dolphin': {
+ 'enable_nightly': True,
+ },
+ 'dolphin_eng': {
+ 'enable_nightly': True,
+ },
+ },
},
'ash': {
'enable_nightly': True,
'platforms': {
'nexus-4': {
'enable_nightly': True,
},
'nexus-4_eng': {
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -52,18 +52,28 @@ PROJECT_BRANCHES = {
},
'macosx64-debug': {
'enable_checktests': False,
'slave_platforms': ['snowleopard'],
},
},
},
#'services-central': {}, # Bug 1010674
- # no desktop builds for bug 1100150
- # 'alder': {},
+ # customized for bug 1156408
+ 'alder': {
+ "enable_nightly": True,
+ 'desktop_mozharness_repacks_enabled': True,
+ "enable_weekly_bundle": True,
+ "pgo_strategy": "periodic",
+ "platforms": {
+ "android-api-9": {
+ "is_mobile_l10n": True,
+ },
+ },
+ },
'ash': {
'enable_perproduct_builds': False,
'desktop_mozharness_builds_enabled': True,
'desktop_mozharness_repacks_enabled': True,
'enable_nightly': True,
'create_snippet': True,
'create_partial': True,
'use_mozharness_repo_cache': False,