--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -84,18 +84,16 @@ GLOBAL_VARS.update({
'default_l10n_space': 4,
'scratchbox_path': '/builds/scratchbox/moz_scratchbox',
'scratchbox_home': '/scratchbox/users/cltbld/home/cltbld',
'use_old_updater': False,
})
# shorthand, because these are used often
OBJDIR = GLOBAL_VARS['objdir']
-SYMBOL_SERVER_PATH = GLOBAL_VARS['symbol_server_path']
-SYMBOL_SERVER_POST_UPLOAD_CMD = GLOBAL_VARS['symbol_server_post_upload_cmd']
builder_prefix = "TB "
GLOBAL_ENV = {
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'TINDERBOX_OUTPUT': '1',
'MOZ_AUTOMATION': '1',
}
@@ -119,21 +117,16 @@ PLATFORM_VARS = {
'stage_platform': 'linux',
'update_platform': 'Linux_x86-gcc3',
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': thunderbird_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'tbirdbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/tbirdbld_dsa",
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
},
'enable_opt_unittests': False,
'enable_checktests': True,
@@ -215,22 +208,16 @@ PLATFORM_VARS = {
'stage_platform': 'linux64',
'update_platform': 'Linux_x86_64-gcc3',
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': thunderbird_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'tbirdbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/tbirdbld_dsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
},
'enable_opt_unittests': False,
'enable_checktests': True,
@@ -305,22 +292,16 @@ PLATFORM_VARS = {
'platform_objdir': "%s/i386" % OBJDIR,
'stage_product': 'thunderbird',
'stage_platform': 'macosx64',
'update_platform': 'Darwin_x86_64-gcc3',
'enable_shared_checkouts': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'SYMBOL_SERVER_HOST': thunderbird_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'tbirdbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/tbirdbld_dsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'macosx64',
'CHOWN_ROOT': '~/bin/chown_root',
'CHOWN_REVERT': '~/bin/chown_revert',
'LC_ALL': 'C',
'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
},
@@ -353,21 +334,16 @@ PLATFORM_VARS = {
'stage_product': 'thunderbird',
'stage_platform': 'win32',
'mochitest_leak_threshold': 484,
'crashtest_leak_threshold': 484,
'update_platform': 'WINNT_x86-msvc',
'enable_shared_checkouts': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': thunderbird_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'tbirdbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/tbirdbld_dsa",
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'PATH': "${MOZILLABUILD}\\nsis-3.0b1;${MOZILLABUILD}\\nsis-2.46u;${MOZILLABUILD}\\python27;${MOZILLABUILD}\\buildbotve\\scripts;${PATH}",
},
'enable_opt_unittests': False,
'enable_checktests': True,
'talos_masters': None,
'test_pretty_names': False,
@@ -396,22 +372,16 @@ PLATFORM_VARS = {
'stage_product': 'thunderbird',
'stage_platform': 'win64',
'mochitest_leak_threshold': 484,
'crashtest_leak_threshold': 484,
'update_platform': 'WINNT_x86_64-msvc',
'enable_shared_checkouts': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': thunderbird_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'tbirdbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/tbirdbld_dsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'win64',
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'PATH': "${MOZILLABUILD}\\nsis-3.0b1;${MOZILLABUILD}\\nsis-2.46u;${MOZILLABUILD}\\python27;${MOZILLABUILD}\\buildbotve\\scripts;${PATH}",
},
'enable_opt_unittests': False,
'enable_checktests': True,
'talos_masters': None,
'test_pretty_names': True,
@@ -955,19 +925,16 @@ BRANCHES['try-comm-central']['platforms'
BRANCHES['try-comm-central']['platforms']['linux64-debug']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try-comm-central']['platforms']['win32-debug']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try-comm-central']['platforms']['macosx64-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try-comm-central']['platforms']['linux']['upload_symbols'] = False
BRANCHES['try-comm-central']['platforms']['linux64']['upload_symbols'] = False
BRANCHES['try-comm-central']['platforms']['macosx64']['upload_symbols'] = False
# Disabled due to issues, see bug 751559
BRANCHES['try-comm-central']['platforms']['win32']['upload_symbols'] = False
-BRANCHES['try-comm-central']['platforms']['win32']['env']['SYMBOL_SERVER_USER'] = 'trybld'
-BRANCHES['try-comm-central']['platforms']['win32']['env']['SYMBOL_SERVER_PATH'] = '/symbols/windows'
-BRANCHES['try-comm-central']['platforms']['win32']['env']['SYMBOL_SERVER_SSH_KEY'] = '/c/Documents and Settings/cltbld/.ssh/trybld_dsa'
######## generic branch configs
for branch in ACTIVE_PROJECT_BRANCHES:
branchConfig = PROJECT_BRANCHES[branch]
BRANCHES[branch]['brand_name'] = branchConfig.get('brand_name', GLOBAL_VARS['brand_name'])
BRANCHES[branch]['repo_path'] = branchConfig.get('repo_path', 'projects/' + branch)
BRANCHES[branch]['mozilla_dir'] = branchConfig.get('mozilla_dir', 'mozilla')
BRANCHES[branch]['mozilla_srcdir'] = branchConfig.get('mozilla_srcdir', 'mozilla')
@@ -989,24 +956,16 @@ for branch in ACTIVE_PROJECT_BRANCHES:
# nightly updates
BRANCHES[branch]['updates_enabled'] = branchConfig.get('updates_enabled', False)
BRANCHES[branch]['update_channel'] = branchConfig.get('update_channel', 'nightly-%s' % branch)
BRANCHES[branch]['create_partial'] = branchConfig.get('create_partial', False)
BRANCHES[branch]['create_partial_l10n'] = branchConfig.get('create_partial_l10n', False)
BRANCHES[branch]['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/thunderbird/nightly/latest-' + branch + '-l10n/'
BRANCHES[branch]['enUS_binaryURL'] = GLOBAL_VARS['download_base_url'] + branchConfig.get('enUS_binaryURL', '')
- if 'linux' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['linux']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch
- if 'linux64' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['linux64']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'linux64-' + branch
- if 'win32' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['win32']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch
- if 'macosx64' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['macosx64']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'macosx64-' + branch
# Platform-specific defaults/interpretation
for platform in BRANCHES[branch]['platforms']:
# point to the mozconfigs, default is generic
if platform.endswith('debug'):
BRANCHES[branch]['platforms'][platform]['mozconfig'] = platform.split('-')[0] + '/' + branchConfig.get('mozconfig_dir', 'generic') + '/debug'
else:
BRANCHES[branch]['platforms'][platform]['mozconfig'] = platform + '/' + branchConfig.get('mozconfig_dir', 'generic') + '/nightly'
# Project branches should be allowed to override the signing servers.