--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -372,28 +372,30 @@ PLATFORM_VARS = {
'multi_locale': False,
'unittest_platform': 'macosx64-mulet-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'OS X Mulet %(branch)s',
'mozconfig': 'in_tree',
'src_mozconfig': 'b2g/dev/config/mozconfigs/macosx64/mulet',
'packageTests': False,
+ 'enable_dep': False,
+ 'enable_periodic': True,
+ 'enable_nightly': True,
'profiled_build': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 12,
'upload_symbols': False,
'download_symbols': False,
'slaves': SLAVES['macosx64-lion'],
'platform_objdir': OBJDIR,
'stage_product': 'b2g',
'stage_platform': 'macosx64-mulet',
'update_platform': 'Darwin_x86_64-gcc3',
'enable_shared_checkouts': True,
- 'enable_nightly': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
@@ -550,19 +552,20 @@ PLATFORM_VARS = {
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'app_name': 'browser',
'base_name': 'Win32 Mulet %(branch)s',
'mozconfig': 'in_tree',
'src_mozconfig': 'b2g/dev/config/mozconfigs/win32/mulet',
- 'enable_dep': True,
+ 'enable_dep': False,
+ 'enable_periodic': True,
+ 'enable_nightly': True,
'profiled_build': False,
- 'enable_nightly': True,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['win64-rev2'],
'platform_objdir': OBJDIR,
@@ -1479,26 +1482,29 @@ BRANCHES['try']['stage_ssh_key'] = 'tryb
BRANCHES['try']['enable_nightly'] = False
BRANCHES['try']['platforms']['linux64-b2g-haz']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try']['platforms']['macosx64_gecko']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try']['platforms']['macosx64_gecko-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try']['platforms']['macosx64-mulet']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try']['platforms']['win32_gecko']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try']['platforms']['win32_gecko-debug']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try']['platforms']['win32-mulet']['slaves'] = TRY_SLAVES['win64-rev2']
-# Bug 1127482 - Make Windows opt and debug, linux debug, and osx debug B2G Desktop builds periodic
-## we can't have 1127482 builders be periodic on try so let's revert them back to dep builds
+# Make periodic B2G Desktop and Mulet builds dep builds on Try (bug 1127482).
BRANCHES['try']['platforms']['macosx64_gecko']['enable_dep'] = True
BRANCHES['try']['platforms']['macosx64_gecko']['enable_periodic'] = False
BRANCHES['try']['platforms']['macosx64_gecko-debug']['enable_dep'] = True
BRANCHES['try']['platforms']['macosx64_gecko-debug']['enable_periodic'] = False
+BRANCHES['try']['platforms']['macosx64-mulet']['enable_dep'] = True
+BRANCHES['try']['platforms']['macosx64-mulet']['enable_periodic'] = False
BRANCHES['try']['platforms']['win32_gecko']['enable_dep'] = True
BRANCHES['try']['platforms']['win32_gecko']['enable_periodic'] = False
BRANCHES['try']['platforms']['win32_gecko-debug']['enable_dep'] = True
BRANCHES['try']['platforms']['win32_gecko-debug']['enable_periodic'] = False
+BRANCHES['try']['platforms']['win32-mulet']['enable_dep'] = True
+BRANCHES['try']['platforms']['win32-mulet']['enable_periodic'] = False
BRANCHES['try']['platforms']['linux64_graphene']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try']['platforms']['macosx64_graphene']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try']['platforms']['win64_graphene']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try']['platforms']['emulator']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try']['platforms']['emulator']['mozharness_config']['extra_args'] = ['--target', 'emulator', '--config', 'b2g/releng-try.py', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
BRANCHES['try']['platforms']['emulator-debug']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try']['platforms']['emulator-debug']['mozharness_config']['extra_args'] = ['--target', 'emulator', '--config', 'b2g/releng-try.py', '--debug', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']