Bug 513154, disable OSX and WinMo builders for Electrolysis (for now), r=bhearsum
authorNick Thomas <nthomas@mozilla.com>
Tue, 01 Sep 2009 10:28:09 +1200
changeset 1469 181f17229ebbd9eef23cacc62eb243f612ead583
parent 1468 521a753b9a99c56b5a70eb03c586088c6d54af83
child 1471 3b3e21d9137cbf7fa4ee390974c203996050dbb3
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersbhearsum
bugs513154
Bug 513154, disable OSX and WinMo builders for Electrolysis (for now), r=bhearsum
mozilla2-staging/config.py
mozilla2-staging/mobile_config.py
mozilla2/config.py
mozilla2/mobile_config.py
--- a/mozilla2-staging/config.py
+++ b/mozilla2-staging/config.py
@@ -890,54 +890,54 @@ BRANCHES['electrolysis']['major_version'
 BRANCHES['electrolysis']['product_name'] = 'firefox'
 BRANCHES['electrolysis']['app_name'] = 'browser'
 BRANCHES['electrolysis']['brand_name'] = 'Minefield'
 BRANCHES['electrolysis']['start_hour'] = [4] 
 BRANCHES['electrolysis']['start_minute'] = [2] 
 BRANCHES['electrolysis']['platforms'] = {
     'linux': {},
     'win32': {},
-    'macosx': {},
+#    'macosx': {},
     'linux-debug': {},
-    'macosx-debug': {},
+#    'macosx-debug': {},
     'win32-debug': {},
 }
 BRANCHES['electrolysis']['platforms']['linux']['mozconfig'] = 'linux/electrolysis/nightly'
-BRANCHES['electrolysis']['platforms']['macosx']['mozconfig'] = 'macosx/electrolysis/nightly'
+#BRANCHES['electrolysis']['platforms']['macosx']['mozconfig'] = 'macosx/electrolysis/nightly'
 BRANCHES['electrolysis']['platforms']['win32']['mozconfig'] = 'win32/electrolysis/nightly'
 BRANCHES['electrolysis']['platforms']['linux-debug']['mozconfig'] = 'linux/electrolysis/debug'
-BRANCHES['electrolysis']['platforms']['macosx-debug']['mozconfig'] = 'macosx/electrolysis/debug'
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['mozconfig'] = 'macosx/electrolysis/debug'
 BRANCHES['electrolysis']['platforms']['win32-debug']['mozconfig'] = 'win32/electrolysis/debug'
 BRANCHES['electrolysis']['platforms']['linux']['base_name'] = 'Linux electrolysis'
 BRANCHES['electrolysis']['platforms']['win32']['base_name'] = 'WINNT 5.2 electrolysis'
-BRANCHES['electrolysis']['platforms']['macosx']['base_name'] = 'OS X 10.5.2 electrolysis'
+#BRANCHES['electrolysis']['platforms']['macosx']['base_name'] = 'OS X 10.5.2 electrolysis'
 BRANCHES['electrolysis']['platforms']['linux-debug']['base_name'] = 'Linux electrolysis leak test'
 BRANCHES['electrolysis']['platforms']['win32-debug']['base_name'] = 'WINNT 5.2 electrolysis leak test'
-BRANCHES['electrolysis']['platforms']['macosx-debug']['base_name'] = 'OS X 10.5.2 electrolysis leak test'
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['base_name'] = 'OS X 10.5.2 electrolysis leak test'
 BRANCHES['electrolysis']['platforms']['linux']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['win32']['profiled_build'] = False
-BRANCHES['electrolysis']['platforms']['macosx']['profiled_build'] = False
+#BRANCHES['electrolysis']['platforms']['macosx']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['linux-debug']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['win32-debug']['profiled_build'] = False
-BRANCHES['electrolysis']['platforms']['macosx-debug']['profiled_build'] = False
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['linux']['build_space'] = 5
 BRANCHES['electrolysis']['platforms']['win32']['build_space'] = 5
-BRANCHES['electrolysis']['platforms']['macosx']['build_space'] = 5
+#BRANCHES['electrolysis']['platforms']['macosx']['build_space'] = 5
 BRANCHES['electrolysis']['platforms']['linux-debug']['build_space'] = 5
 BRANCHES['electrolysis']['platforms']['win32-debug']['build_space'] = 5
-BRANCHES['electrolysis']['platforms']['macosx-debug']['build_space'] = 5
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['build_space'] = 5
 BRANCHES['electrolysis']['platforms']['linux']['builds_before_reboot'] = 5
 BRANCHES['electrolysis']['platforms']['win32']['builds_before_reboot'] = 5
-BRANCHES['electrolysis']['platforms']['macosx']['builds_before_reboot'] = 5
+#BRANCHES['electrolysis']['platforms']['macosx']['builds_before_reboot'] = 5
 BRANCHES['electrolysis']['platforms']['linux-debug']['builds_before_reboot'] = 5
 BRANCHES['electrolysis']['platforms']['win32-debug']['builds_before_reboot'] = 5
-BRANCHES['electrolysis']['platforms']['macosx-debug']['builds_before_reboot'] = 5
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['builds_before_reboot'] = 5
 BRANCHES['electrolysis']['platforms']['linux']['upload_symbols'] = True
 BRANCHES['electrolysis']['platforms']['win32']['upload_symbols'] = True
-BRANCHES['electrolysis']['platforms']['macosx']['upload_symbols'] = True
+#BRANCHES['electrolysis']['platforms']['macosx']['upload_symbols'] = True
 BRANCHES['electrolysis']['create_snippet'] = False
 # Disable XULRunner / SDK builds
 BRANCHES['electrolysis']['enable_xulrunner'] = False
 # Enable unit tests
 BRANCHES['electrolysis']['enable_unittests'] = True
 BRANCHES['electrolysis']['enable_mac_a11y'] = True
 BRANCHES['electrolysis']['platforms']['win32']['mochitest_leak_threshold'] = 484
 BRANCHES['electrolysis']['platforms']['win32']['crashtest_leak_threshold'] = 484
@@ -949,29 +949,29 @@ BRANCHES['electrolysis']['l10nNightlyUpd
 BRANCHES['electrolysis']['l10nDatedDirs'] = False 
 # nightly shark build for profiling
 BRANCHES['electrolysis']['enable_shark'] = True
 # need this or the master.cfg will bail
 BRANCHES['electrolysis']['aus2_base_upload_dir'] = 'fake'
 BRANCHES['electrolysis']['idle_timeout'] = 60*60*9   # 9 hours
 BRANCHES['electrolysis']['platforms']['linux']['update_platform'] = 'fake'
 BRANCHES['electrolysis']['platforms']['win32']['update_platform'] = 'fake'
-BRANCHES['electrolysis']['platforms']['macosx']['update_platform'] = 'fake'
+#BRANCHES['electrolysis']['platforms']['macosx']['update_platform'] = 'fake'
 BRANCHES['electrolysis']['tinderbox_tree'] = 'MozillaTest'
 BRANCHES['electrolysis']['platforms']['linux']['slaves'] = SLAVES['linux']
 BRANCHES['electrolysis']['platforms']['win32']['slaves'] = SLAVES['win32']
-BRANCHES['electrolysis']['platforms']['macosx']['slaves'] = SLAVES['macosx']
+#BRANCHES['electrolysis']['platforms']['macosx']['slaves'] = SLAVES['macosx']
 BRANCHES['electrolysis']['platforms']['linux-debug']['slaves'] = SLAVES['linux']
 BRANCHES['electrolysis']['platforms']['win32-debug']['slaves'] = SLAVES['win32']
-BRANCHES['electrolysis']['platforms']['macosx-debug']['slaves'] = SLAVES['macosx']
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['slaves'] = SLAVES['macosx']
 BRANCHES['electrolysis']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['electrolysis']['platforms']['win32']['platform_objdir'] = OBJDIR
-BRANCHES['electrolysis']['platforms']['macosx']['platform_objdir'] = '%s/ppc' % OBJDIR
+#BRANCHES['electrolysis']['platforms']['macosx']['platform_objdir'] = '%s/ppc' % OBJDIR
 BRANCHES['electrolysis']['platforms']['linux-debug']['platform_objdir'] = OBJDIR
-BRANCHES['electrolysis']['platforms']['macosx-debug']['platform_objdir'] = OBJDIR
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['platform_objdir'] = OBJDIR
 BRANCHES['electrolysis']['platforms']['win32-debug']['platform_objdir'] = OBJDIR
 BRANCHES['electrolysis']['platforms']['linux']['env'] = {
     'MOZ_OBJDIR': OBJDIR,
     'SYMBOL_SERVER_HOST': 'staging-stage.build.mozilla.org',
     'SYMBOL_SERVER_USER': 'ffxbld',
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/ffxbld_dsa",
     'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
@@ -983,35 +983,35 @@ BRANCHES['electrolysis']['platforms']['w
     'SYMBOL_SERVER_HOST': 'staging-stage.build.mozilla.org',
     'SYMBOL_SERVER_USER': 'ffxbld',
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': "/c/Documents and Settings/cltbld/.ssh/ffxbld_dsa",
     'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
 }
-BRANCHES['electrolysis']['platforms']['macosx']['env'] = {
-    'MOZ_OBJDIR': OBJDIR,
-    'SYMBOL_SERVER_HOST': 'staging-stage.build.mozilla.org',
-    'SYMBOL_SERVER_USER': 'ffxbld',
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_dsa",
-    'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-}
+#BRANCHES['electrolysis']['platforms']['macosx']['env'] = {
+#    'MOZ_OBJDIR': OBJDIR,
+#    'SYMBOL_SERVER_HOST': 'staging-stage.build.mozilla.org',
+#    'SYMBOL_SERVER_USER': 'ffxbld',
+#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+#    'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_dsa",
+#    'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
+#    'TINDERBOX_OUTPUT': '1',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#}
 BRANCHES['electrolysis']['platforms']['linux-debug']['env'] = {
     'MOZ_OBJDIR': OBJDIR,
     'DISPLAY': ':2',
     'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
     'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
 }
-BRANCHES['electrolysis']['platforms']['macosx-debug']['env'] = {
-    'MOZ_OBJDIR': OBJDIR,
-    'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-}
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['env'] = {
+#    'MOZ_OBJDIR': OBJDIR,
+#    'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#}
 BRANCHES['electrolysis']['platforms']['win32-debug']['env'] = {
     'MOZ_OBJDIR': OBJDIR,
     'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
 }
--- a/mozilla2-staging/mobile_config.py
+++ b/mozilla2-staging/mobile_config.py
@@ -36,17 +36,17 @@ MOBILE_BRANCHES['mobile-trunk']['platfor
     'linux-i686': {},
     'winmo-arm': {},
 }
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms'] = {}
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-central'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_name'] ='Linux Fennec Desktop mozilla-central'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_name'] = 'WinMo mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_workdir'] = 'build'
@@ -87,17 +87,17 @@ MOBILE_BRANCHES['mobile-1.9.2']['platfor
     'linux-i686': {},
     'winmo-arm': {},
 }
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms'] = {}
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-1.9.2'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_name'] ='Linux Fennec Desktop mozilla-1.9.2'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['winmo-arm']['base_name'] = 'WinMo mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['winmo-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_workdir'] = 'build'
@@ -154,39 +154,38 @@ MOBILE_BRANCHES['mobile-tracemonkey']['p
 MOBILE_BRANCHES['mobile-electrolysis']['main_config'] = config.BRANCHES['electrolysis']
 MOBILE_BRANCHES['mobile-electrolysis']['repo_path'] = 'projects/electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-electrolysis']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-electrolysis']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms'] = {
     'linux-gnueabi-arm': {},
     'linux-i686': {},
-    'winmo-arm': {},
+#    'winmo-arm': {},
 }
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_name'] ='Linux Fennec Desktop electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_name'] = 'WinMo electrolysis'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop electrolysis'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_name'] = 'WinMo electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['build_space'] = 5
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_builddir'] = 'linux-i686-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_l10n_workdir'] = 'l10n'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_workdir'] = '.'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_builddir'] = 'winmo-electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_workdir'] = '.'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_builddir'] = 'winmo-electrolysis'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
 MOBILE_BRANCHES['mobile-electrolysis']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enUS_binaryURL'] = \
     config.BRANCHES['electrolysis']['download_base_url'] + '/nightly/latest-mobile-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['tinderbox_tree'] = 'MozillaTest'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['slaves'] = mobile_slaves['linux-gnueabi-arm']
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['slaves'] = mobile_slaves['linux-i686']
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['env'] = {}
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['env'] = {}
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
-
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
--- a/mozilla2/config.py
+++ b/mozilla2/config.py
@@ -881,54 +881,54 @@ BRANCHES['electrolysis']['major_version'
 BRANCHES['electrolysis']['product_name'] = 'firefox'
 BRANCHES['electrolysis']['app_name'] = 'browser'
 BRANCHES['electrolysis']['brand_name'] = 'Minefield'
 BRANCHES['electrolysis']['start_hour'] = [4] 
 BRANCHES['electrolysis']['start_minute'] = [2] 
 BRANCHES['electrolysis']['platforms'] = {
     'linux': {},
     'win32': {},
-    'macosx': {},
+#    'macosx': {},
     'linux-debug': {},
-    'macosx-debug': {},
+#    'macosx-debug': {},
     'win32-debug': {},
 }
 BRANCHES['electrolysis']['platforms']['linux']['mozconfig'] = 'linux/electrolysis/nightly'
-BRANCHES['electrolysis']['platforms']['macosx']['mozconfig'] = 'macosx/electrolysis/nightly'
+#BRANCHES['electrolysis']['platforms']['macosx']['mozconfig'] = 'macosx/electrolysis/nightly'
 BRANCHES['electrolysis']['platforms']['win32']['mozconfig'] = 'win32/electrolysis/nightly'
 BRANCHES['electrolysis']['platforms']['linux-debug']['mozconfig'] = 'linux/electrolysis/debug'
-BRANCHES['electrolysis']['platforms']['macosx-debug']['mozconfig'] = 'macosx/electrolysis/debug'
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['mozconfig'] = 'macosx/electrolysis/debug'
 BRANCHES['electrolysis']['platforms']['win32-debug']['mozconfig'] = 'win32/electrolysis/debug'
 BRANCHES['electrolysis']['platforms']['linux']['base_name'] = 'Linux electrolysis'
 BRANCHES['electrolysis']['platforms']['win32']['base_name'] = 'WINNT 5.2 electrolysis'
-BRANCHES['electrolysis']['platforms']['macosx']['base_name'] = 'OS X 10.5.2 electrolysis'
+#BRANCHES['electrolysis']['platforms']['macosx']['base_name'] = 'OS X 10.5.2 electrolysis'
 BRANCHES['electrolysis']['platforms']['linux-debug']['base_name'] = 'Linux electrolysis leak test'
 BRANCHES['electrolysis']['platforms']['win32-debug']['base_name'] = 'WINNT 5.2 electrolysis leak test'
-BRANCHES['electrolysis']['platforms']['macosx-debug']['base_name'] = 'OS X 10.5.2 electrolysis leak test'
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['base_name'] = 'OS X 10.5.2 electrolysis leak test'
 BRANCHES['electrolysis']['platforms']['linux']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['win32']['profiled_build'] = False
-BRANCHES['electrolysis']['platforms']['macosx']['profiled_build'] = False
+#BRANCHES['electrolysis']['platforms']['macosx']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['linux-debug']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['win32-debug']['profiled_build'] = False
-BRANCHES['electrolysis']['platforms']['macosx-debug']['profiled_build'] = False
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['profiled_build'] = False
 BRANCHES['electrolysis']['platforms']['linux']['build_space'] = 5
 BRANCHES['electrolysis']['platforms']['win32']['build_space'] = 5
-BRANCHES['electrolysis']['platforms']['macosx']['build_space'] = 5
+#BRANCHES['electrolysis']['platforms']['macosx']['build_space'] = 5
 BRANCHES['electrolysis']['platforms']['linux-debug']['build_space'] = 3
 BRANCHES['electrolysis']['platforms']['win32-debug']['build_space'] = 4
-BRANCHES['electrolysis']['platforms']['macosx-debug']['build_space'] = 3
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['build_space'] = 3
 BRANCHES['electrolysis']['platforms']['linux']['builds_before_reboot'] = None
 BRANCHES['electrolysis']['platforms']['win32']['builds_before_reboot'] = None
-BRANCHES['electrolysis']['platforms']['macosx']['builds_before_reboot'] = None
+#BRANCHES['electrolysis']['platforms']['macosx']['builds_before_reboot'] = None
 BRANCHES['electrolysis']['platforms']['linux-debug']['builds_before_reboot'] = None
 BRANCHES['electrolysis']['platforms']['win32-debug']['builds_before_reboot'] = None
-BRANCHES['electrolysis']['platforms']['macosx-debug']['builds_before_reboot'] = None
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['builds_before_reboot'] = None
 BRANCHES['electrolysis']['platforms']['linux']['upload_symbols'] = True
 BRANCHES['electrolysis']['platforms']['win32']['upload_symbols'] = True
-BRANCHES['electrolysis']['platforms']['macosx']['upload_symbols'] = True
+#BRANCHES['electrolysis']['platforms']['macosx']['upload_symbols'] = True
 # Disable XULRunner / SDK builds
 BRANCHES['electrolysis']['enable_xulrunner'] = False
 # Enable unit tests
 BRANCHES['electrolysis']['enable_unittests'] = True
 BRANCHES['electrolysis']['enable_mac_a11y'] = True
 BRANCHES['electrolysis']['platforms']['win32']['mochitest_leak_threshold'] = 484
 BRANCHES['electrolysis']['platforms']['win32']['crashtest_leak_threshold'] = 484
 BRANCHES['electrolysis']['unittest_build_space'] = 5
@@ -940,30 +940,30 @@ BRANCHES['electrolysis']['l10nDatedDirs'
 # nightly shark build for profiling
 BRANCHES['electrolysis']['enable_shark'] = True
 BRANCHES['electrolysis']['create_snippet'] = False
 # need this or the master.cfg will bail
 BRANCHES['electrolysis']['aus2_base_upload_dir'] = 'fake'
 BRANCHES['electrolysis']['idle_timeout'] = 60*60*9   # 9 hours
 BRANCHES['electrolysis']['platforms']['linux']['update_platform'] = 'fake'
 BRANCHES['electrolysis']['platforms']['win32']['update_platform'] = 'fake'
-BRANCHES['electrolysis']['platforms']['macosx']['update_platform'] = 'fake'
+#BRANCHES['electrolysis']['platforms']['macosx']['update_platform'] = 'fake'
 BRANCHES['electrolysis']['tinderbox_tree'] = 'Electrolysis'
 BRANCHES['electrolysis']['packaged_unittest_tinderbox_tree'] = 'Electrolysis-Unittest'
 BRANCHES['electrolysis']['platforms']['linux']['slaves'] = SLAVES['linux']
 BRANCHES['electrolysis']['platforms']['win32']['slaves'] = SLAVES['win32']
-BRANCHES['electrolysis']['platforms']['macosx']['slaves'] = SLAVES['macosx']
+#BRANCHES['electrolysis']['platforms']['macosx']['slaves'] = SLAVES['macosx']
 BRANCHES['electrolysis']['platforms']['linux-debug']['slaves'] = SLAVES['linux']
 BRANCHES['electrolysis']['platforms']['win32-debug']['slaves'] = SLAVES['win32']
-BRANCHES['electrolysis']['platforms']['macosx-debug']['slaves'] = SLAVES['macosx']
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['slaves'] = SLAVES['macosx']
 BRANCHES['electrolysis']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['electrolysis']['platforms']['win32']['platform_objdir'] = OBJDIR
-BRANCHES['electrolysis']['platforms']['macosx']['platform_objdir'] = '%s/ppc' % OBJDIR
+#BRANCHES['electrolysis']['platforms']['macosx']['platform_objdir'] = '%s/ppc' % OBJDIR
 BRANCHES['electrolysis']['platforms']['linux-debug']['platform_objdir'] = OBJDIR
-BRANCHES['electrolysis']['platforms']['macosx-debug']['platform_objdir'] = OBJDIR
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['platform_objdir'] = OBJDIR
 BRANCHES['electrolysis']['platforms']['win32-debug']['platform_objdir'] = OBJDIR
 BRANCHES['electrolysis']['platforms']['linux']['env'] = {
     'MOZ_OBJDIR': OBJDIR,
     'SYMBOL_SERVER_HOST': 'dm-symbolpush01.mozilla.org',
     'SYMBOL_SERVER_USER': 'ffxbld',
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/ffxbld_dsa",
     'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
@@ -975,35 +975,35 @@ BRANCHES['electrolysis']['platforms']['w
     'SYMBOL_SERVER_HOST': 'dm-symbolpush01.mozilla.org',
     'SYMBOL_SERVER_USER': 'ffxbld',
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': "/c/Documents and Settings/cltbld/.ssh/ffxbld_dsa",
     'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
 }
-BRANCHES['electrolysis']['platforms']['macosx']['env'] = {
-    'MOZ_OBJDIR': OBJDIR,
-    'SYMBOL_SERVER_HOST': 'dm-symbolpush01.mozilla.org',
-    'SYMBOL_SERVER_USER': 'ffxbld',
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_dsa",
-    'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-}
+#BRANCHES['electrolysis']['platforms']['macosx']['env'] = {
+#    'MOZ_OBJDIR': OBJDIR,
+#    'SYMBOL_SERVER_HOST': 'dm-symbolpush01.mozilla.org',
+#    'SYMBOL_SERVER_USER': 'ffxbld',
+#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+#    'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_dsa",
+#    'MOZ_SYMBOLS_EXTRA_BUILDID': 'electrolysis',
+#    'TINDERBOX_OUTPUT': '1',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#}
 BRANCHES['electrolysis']['platforms']['linux-debug']['env'] = {
     'MOZ_OBJDIR': OBJDIR,
     'DISPLAY': ':2',
     'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
     'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
 }
-BRANCHES['electrolysis']['platforms']['macosx-debug']['env'] = {
-    'MOZ_OBJDIR': OBJDIR,
-    'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-}
+#BRANCHES['electrolysis']['platforms']['macosx-debug']['env'] = {
+#    'MOZ_OBJDIR': OBJDIR,
+#    'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#}
 BRANCHES['electrolysis']['platforms']['win32-debug']['env'] = {
     'MOZ_OBJDIR': OBJDIR,
     'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
 }
--- a/mozilla2/mobile_config.py
+++ b/mozilla2/mobile_config.py
@@ -146,38 +146,38 @@ MOBILE_BRANCHES['mobile-tracemonkey']['p
 MOBILE_BRANCHES['mobile-electrolysis']['main_config'] = config.BRANCHES['electrolysis']
 MOBILE_BRANCHES['mobile-electrolysis']['repo_path'] = 'projects/electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-electrolysis']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-electrolysis']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms'] = {
     'linux-gnueabi-arm': {},
     'linux-i686': {},
-    'winmo-arm': {},
+#    'winmo-arm': {},
 }
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_name'] = 'WinMo electrolysis'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_name'] = 'WinMo electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['build_space'] = 5
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_builddir'] = 'linux-i686-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_l10n_workdir'] = 'l10n'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_workdir'] = '.'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_builddir'] = 'winmo-electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_workdir'] = '.'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_builddir'] = 'winmo-electrolysis'
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
 MOBILE_BRANCHES['mobile-electrolysis']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enUS_binaryURL'] = \
     config.BRANCHES['electrolysis']['download_base_url'] + '/nightly/latest-mobile-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['tinderbox_tree'] = 'Electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['slaves'] = mobile_slaves['linux-gnueabi-arm']
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['slaves'] = mobile_slaves['linux-i686']
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['env'] = {}
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['env'] = {}
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
+#MOBILE_BRANCHES['mobile-electrolysis']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']