--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -124,19 +124,16 @@ GLOBAL_VARS = {
# list platforms with mozharness l10n repacks enabled.
# mozharness repacks will be enabled per branch
}
GLOBAL_VARS.update(localconfig.GLOBAL_VARS.copy())
# 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']
-SYMBOL_SERVER_MOBILE_PATH = GLOBAL_VARS['symbol_server_mobile_path']
GLOBAL_ENV = {
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'TINDERBOX_OUTPUT': '1',
'MOZ_AUTOMATION': '1',
}
PLATFORM_VARS = {
@@ -187,21 +184,16 @@ PLATFORM_VARS = {
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
'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_checktests': True,
'enable_build_analysis': True,
@@ -310,22 +302,16 @@ PLATFORM_VARS = {
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- '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_checktests': True,
'enable_build_analysis': True,
@@ -424,22 +410,16 @@ PLATFORM_VARS = {
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64-asan',
'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,
@@ -527,22 +507,16 @@ PLATFORM_VARS = {
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64-tsan',
'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': True,
'enable_checktests': True,
@@ -630,22 +604,16 @@ PLATFORM_VARS = {
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64-asan-debug',
'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,
@@ -733,22 +701,16 @@ PLATFORM_VARS = {
'enable_ccache': True,
'enable_shared_checkouts': True,
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64-st-an-debug',
'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': False,
@@ -884,22 +846,16 @@ PLATFORM_VARS = {
'stage_platform': 'linux64-cc',
'update_platform': 'Linux_x86_64-gcc3',
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- '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_checktests': True,
'enable_build_analysis': False,
@@ -981,22 +937,16 @@ PLATFORM_VARS = {
'stage_platform': 'macosx64',
'update_platform': 'Darwin_x86_64-gcc3',
'enable_shared_checkouts': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_rsa",
- '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',
},
@@ -1059,21 +1009,16 @@ PLATFORM_VARS = {
'stage_product': 'firefox',
'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': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
'PATH': "${MOZILLABUILD}\\nsis-3.0b1;${MOZILLABUILD}\\nsis-2.46u;${MOZILLABUILD}\\python27;${MOZILLABUILD}\\buildbotve\\scripts;${PATH}",
},
'enable_checktests': True,
'talos_masters': GLOBAL_VARS['talos_masters'],
'test_pretty_names': False,
@@ -1132,22 +1077,16 @@ PLATFORM_VARS = {
'stage_product': 'firefox',
'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': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
- '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': GLOBAL_VARS['talos_masters'],
'test_pretty_names': True,
@@ -1690,21 +1629,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SHIP_LICENSED_FONTS': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/opt/local/bin:/tools/python/bin:/tools/buildbot/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/',
},
'enable_opt_unittests': False,
@@ -1779,21 +1713,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SHIP_LICENSED_FONTS': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/opt/local/bin:/tools/python/bin:/tools/buildbot/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/',
},
'enable_opt_unittests': False,
@@ -1868,21 +1797,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SHIP_LICENSED_FONTS': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/opt/local/bin:/tools/python/bin:/tools/buildbot/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/',
},
'enable_opt_unittests': False,
@@ -1954,21 +1878,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:/usr/bin',
},
'enable_opt_unittests': False,
'talos_masters': GLOBAL_VARS['talos_masters'],
@@ -2039,21 +1958,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SHIP_LICENSED_FONTS': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:/usr/bin',
},
'enable_opt_unittests': False,
@@ -2123,21 +2037,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SHIP_LICENSED_FONTS': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:/usr/bin',
},
'enable_opt_unittests': False,
@@ -2207,21 +2116,16 @@ PLATFORM_VARS = {
('/tools/tooltool.py', '/builds/tooltool.py'),
],
'env': {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SHIP_LICENSED_FONTS': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:/usr/bin',
},
'enable_opt_unittests': False,
@@ -2585,21 +2489,18 @@ BRANCHES['mozilla-central']['desktop_moz
# generated.
BRANCHES['mozilla-central']['updates_enabled'] = True
BRANCHES['mozilla-central']['update_channel'] = 'nightly'
BRANCHES['mozilla-central']['create_partial'] = True
BRANCHES['mozilla-central']['create_partial_l10n'] = True
BRANCHES['mozilla-central']['enable_blocklist_update'] = True
BRANCHES['mozilla-central']['enable_hsts_update'] = True
BRANCHES['mozilla-central']['enable_hpkp_update'] = True
-BRANCHES['mozilla-central']['platforms']['android-x86']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-x86'
BRANCHES['mozilla-central']['platforms']['android-x86']['updates_enabled'] = True
-BRANCHES['mozilla-central']['platforms']['android-api-9']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-9'
BRANCHES['mozilla-central']['platforms']['android-api-9']['updates_enabled'] = True
-BRANCHES['mozilla-central']['platforms']['android-api-15']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-15'
BRANCHES['mozilla-central']['platforms']['android-api-15']['updates_enabled'] = True
BRANCHES['mozilla-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['win64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-api-9']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-api-15']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
@@ -2978,34 +2879,16 @@ for branch in ACTIVE_PROJECT_BRANCHES:
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)
#make sure it has an ending slash
BRANCHES[branch]['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/firefox/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 'android-api-9' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['android-api-9']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-9-' + branch
- # TODO - project branch could be based on any gecko num. we should remove this once api-11 is
- # gone from all release branches
- if 'android-api-11' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['android-api-11']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-11-' + branch
- if 'android-api-15' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['android-api-15']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-15-' + branch
- if 'android-x86' in BRANCHES[branch]['platforms']:
- BRANCHES[branch]['platforms']['android-x86']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-x86-' + 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') and 'android' not in platform:
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.