Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1261045: remove unused SYMBOL_SERVER_*; r=ted.mielczarek

Browse Source 
MozReview-Commit-ID: 4fyzQufrXbO

--HG--
extra : rebase_source : a739e0c0004df6d3d49d3ec9687a25010b024dfe
This commit is contained in:
Dustin J. Mitchell 2016-04-01 14:00:27 +00:00
parent 3c0460b85b
commit 6618eec31d
23 changed files with 4 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -312,8 +312,6 @@ uploadsymbols:
ifdef MOZ_CRASHREPORTER
ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
$(PYTHON) -u $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
else
$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
endif
endif

5
testing/mozharness/configs/b2g/releng-emulator.py
View File

@ -62,11 +62,6 @@ config = {
"CCACHE_COMPRESS": "1",
"CCACHE_UMASK": "002",
"GAIA_OPTIMIZE": "1",
"SYMBOL_SERVER_HOST": "symbolpush.mozilla.org",
"SYMBOL_SERVER_USER": "b2gbld",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
"POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
"WGET_OPTS": "-c -q",
"PATH": "/tools/python27/bin:%(PATH)s",
},

5
testing/mozharness/configs/b2g/releng-fota-eng.py
View File

@ -62,11 +62,6 @@ config = {
"CCACHE_COMPRESS": "1",
"CCACHE_UMASK": "002",
"GAIA_OPTIMIZE": "1",
"SYMBOL_SERVER_HOST": "symbolpush.mozilla.org",
"SYMBOL_SERVER_USER": "b2gbld",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
"POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
"B2G_UPDATER": "1",
"B2G_SYSTEM_APPS": "1",
"WGET_OPTS": "-c -q",

5
testing/mozharness/configs/b2g/releng-fota-updates.py
View File

@ -61,11 +61,6 @@ config = {
"CCACHE_COMPRESS": "1",
"CCACHE_UMASK": "002",
"GAIA_OPTIMIZE": "1",
"SYMBOL_SERVER_HOST": "symbolpush.mozilla.org",
"SYMBOL_SERVER_USER": "b2gbld",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
"POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
"WGET_OPTS": "-c -q",
"PATH": "/tools/python27/bin:%(PATH)s",
},

5
testing/mozharness/configs/b2g/releng-otoro-eng.py
View File

@ -62,11 +62,6 @@ config = {
"CCACHE_COMPRESS": "1",
"CCACHE_UMASK": "002",
"GAIA_OPTIMIZE": "1",
"SYMBOL_SERVER_HOST": "symbolpush.mozilla.org",
"SYMBOL_SERVER_USER": "b2gbld",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
"POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
"B2G_UPDATER": "1",
"B2G_SYSTEM_APPS": "1",
"WGET_OPTS": "-c -q",

5
testing/mozharness/configs/b2g/releng-otoro.py
View File

@ -60,11 +60,6 @@ config = {
"CCACHE_COMPRESS": "1",
"CCACHE_UMASK": "002",
"GAIA_OPTIMIZE": "1",
"SYMBOL_SERVER_HOST": "symbolpush.mozilla.org",
"SYMBOL_SERVER_USER": "b2gbld",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
"POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
"WGET_OPTS": "-c -q",
"PATH": "/tools/python27/bin:%(PATH)s",
},

5
testing/mozharness/configs/b2g/releng-private-updates.py
View File

@ -61,11 +61,6 @@ config = {
"CCACHE_COMPRESS": "1",
"CCACHE_UMASK": "002",
"GAIA_OPTIMIZE": "1",
"SYMBOL_SERVER_HOST": "symbolpush.mozilla.org",
"SYMBOL_SERVER_USER": "b2gbld",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
"POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
"WGET_OPTS": "-c -q",
"PATH": "/tools/python27/bin:%(PATH)s",
},

3
testing/mozharness/configs/builds/build_pool_specifics.py
View File

@ -16,7 +16,6 @@ config = {
'http://dev-stage01.build.mozilla.org/pub/mozilla'
'.org/firefox/bundles',
],
'symbol_server_host': "dev-stage01.srv.releng.scl3.mozilla.com",
'stage_server': 'upload.ffxbld.productdelivery.stage.mozaws.net',
"sendchange_masters": ["dev-master1.srv.releng.scl3.mozilla.com:9038"],
'taskcluster_index': 'index.garbage.staging',
@ -33,7 +32,6 @@ config = {
"hgtool_base_bundle_urls": [
'https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'
],
'symbol_server_host': "symbolpush.mozilla.org",
# bug 1216907, set this at branch level
# 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
"sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
@ -41,7 +39,6 @@ config = {
},
"taskcluster": {
'graph_server': 'graphs.mozilla.org',
'symbol_server_host': "symbolpush.mozilla.org",
'stage_server': 'ignored',
# use the relengapi proxy to talk to tooltool
"tooltool_servers": ['http://relengapi/tooltool/'],

6
testing/mozharness/configs/builds/releng_base_android_64_builds.py
View File

@ -73,12 +73,6 @@ config = {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',

6
testing/mozharness/configs/builds/releng_base_linux_32_builds.py
View File

@ -84,12 +84,6 @@ config = {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',

6
testing/mozharness/configs/builds/releng_base_linux_64_builds.py
View File

@ -83,12 +83,6 @@ config = {
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_rsa",
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',

6
testing/mozharness/configs/builds/releng_base_mac_64_builds.py
View File

@ -50,12 +50,6 @@ config = {
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_rsa",
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'CHOWN_ROOT': '~/bin/chown_root',
'CHOWN_REVERT': '~/bin/chown_revert',
'TINDERBOX_OUTPUT': '1',

6
testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
View File

@ -47,12 +47,6 @@ config = {
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_rsa",
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',

6
testing/mozharness/configs/builds/releng_base_windows_32_builds.py
View File

@ -79,12 +79,6 @@ config = {
'%s' % (os.environ.get('path')),
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': '/c/Users/cltbld/.ssh/ffxbld_rsa',
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'TINDERBOX_OUTPUT': '1',
},
'upload_env': {

6
testing/mozharness/configs/builds/releng_base_windows_64_builds.py
View File

@ -77,12 +77,6 @@ config = {
'%s' % (os.environ.get('path')),
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
'SYMBOL_SERVER_SSH_KEY': '/c/Users/cltbld/.ssh/ffxbld_rsa',
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': '/mnt/netapp/breakpad/symbols_ffx/',
'POST_SYMBOL_UPLOAD_CMD': '/usr/local/bin/post-symbol-upload.py',
'TINDERBOX_OUTPUT': '1',
},
'upload_env': {

4
testing/mozharness/configs/builds/releng_sub_linux_configs/64_graphene.py
View File

@ -34,10 +34,6 @@ config = {
'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',
"SYMBOL_SERVER_HOST": "%(symbol_server_host)s",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/ffxbld_rsa",
"SYMBOL_SERVER_USER": "ffxbld",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_ffx",
},
'src_mozconfig': 'b2g/graphene/config/mozconfigs/linux64/nightly',
'balrog_platform': 'linux64',

4
testing/mozharness/configs/builds/releng_sub_linux_configs/64_horizon.py
View File

@ -34,10 +34,6 @@ config = {
'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',
"SYMBOL_SERVER_HOST": "%(symbol_server_host)s",
"SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/ffxbld_rsa",
"SYMBOL_SERVER_USER": "ffxbld",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_ffx",
},
'src_mozconfig': 'b2g/graphene/config/horizon-mozconfigs/linux64/nightly',
'balrog_platform': 'linux64',

4
testing/mozharness/configs/builds/releng_sub_mac_configs/64_graphene.py
View File

@ -32,10 +32,6 @@ config = {
## 64 bit specific
'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
'/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
"SYMBOL_SERVER_HOST": "%(symbol_server_host)s",
"SYMBOL_SERVER_SSH_KEY": "/Users/cltbld/.ssh/ffxbld_rsa",
"SYMBOL_SERVER_USER": "ffxbld",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_ffx",
},
'src_mozconfig': 'b2g/graphene/config/mozconfigs/macosx64/nightly',
'balrog_platform': 'macosx64',

4
testing/mozharness/configs/builds/releng_sub_mac_configs/64_horizon.py
View File

@ -32,10 +32,6 @@ config = {
## 64 bit specific
'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
'/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
"SYMBOL_SERVER_HOST": "%(symbol_server_host)s",
"SYMBOL_SERVER_SSH_KEY": "/Users/cltbld/.ssh/ffxbld_rsa",
"SYMBOL_SERVER_USER": "ffxbld",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_ffx",
},
'src_mozconfig': 'b2g/graphene/config/horizon-mozconfigs/macosx64/nightly',
'balrog_platform': 'macosx64',

4
testing/mozharness/configs/builds/releng_sub_windows_configs/64_graphene.py
View File

@ -31,10 +31,6 @@ config = {
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
"SYMBOL_SERVER_HOST": "%(symbol_server_host)s",
"SYMBOL_SERVER_SSH_KEY": "/c/Users/cltbld/.ssh/ffxbld_rsa",
"SYMBOL_SERVER_USER": "ffxbld",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_ffx",
},
'src_mozconfig': 'b2g/graphene/config/mozconfigs/win64/nightly',
'balrog_platform': 'win64',

4
testing/mozharness/configs/builds/releng_sub_windows_configs/64_horizon.py
View File

@ -31,10 +31,6 @@ config = {
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
"SYMBOL_SERVER_HOST": "%(symbol_server_host)s",
"SYMBOL_SERVER_SSH_KEY": "/c/Users/cltbld/.ssh/ffxbld_rsa",
"SYMBOL_SERVER_USER": "ffxbld",
"SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_ffx",
},
'src_mozconfig': 'b2g/graphene/config/horizon-mozconfigs/win64/nightly',
'balrog_platform': 'win64',

15
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -615,8 +615,8 @@ class BuildScript(BuildbotMixin, PurgeMixin, MockMixin, BalrogMixin,
self.client_id = None
self.access_token = None
# Call this before creating the virtualenv so that we have things like
# symbol_server_host in the config
# Call this before creating the virtualenv so that we can support
# substituting config values with other config values.
self.query_build_env()
# We need to create the virtualenv directly (without using an action) in
@ -836,20 +836,13 @@ or run without that action (ie: --no-{action})"
branch_enabled = self.branch in self.config.get('nightly_promotion_branches')
return platform_enabled and branch_enabled
def query_build_env(self, replace_dict=None, **kwargs):
def query_build_env(self, **kwargs):
c = self.config
if not replace_dict:
replace_dict = {}
# now let's grab the right host based off staging/production
# symbol_server_host is defined in build_pool_specifics.py
replace_dict.update({"symbol_server_host": c['symbol_server_host']})
# let's evoke the base query_env and make a copy of it
# as we don't always want every key below added to the same dict
env = copy.deepcopy(
super(BuildScript, self).query_env(replace_dict=replace_dict,
**kwargs)
super(BuildScript, self).query_env(**kwargs)
)
# first grab the buildid

53
toolkit/crashreporter/tools/upload_symbols.sh
View File

@ -1,53 +0,0 @@
#!/bin/bash
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This script expects the following environment variables to be set:
# SYMBOL_SERVER_HOST : host to upload symbols to
# SYMBOL_SERVER_USER : username on that host
# SYMBOL_SERVER_PATH : path on that host to put symbols in
#
# And will use the following optional environment variables if set:
# SYMBOL_SERVER_SSH_KEY : path to a ssh private key to use
# SYMBOL_SERVER_PORT : port to use for ssh
# POST_SYMBOL_UPLOAD_CMD: a commandline to run on the remote host after
# uploading. The full path of the symbol index
# file will be appended to the commandline.
#
# The script expects two command-line arguments, in this order:
# - The symbol index name
# - The symbol archive
#
set -e
: ${SYMBOL_SERVER_HOST?} ${SYMBOL_SERVER_USER?} ${SYMBOL_SERVER_PATH?} ${1?"You must specify a symbol index name."} ${2?"You must specify a symbol archive to upload"}
SYMBOL_INDEX_NAME="$1"
SYMBOL_ARCHIVE="$2"
hash=`openssl dgst -sha1 "${SYMBOL_ARCHIVE}" | sed 's/^.*)=//' | sed 's/\ //g'`
archive="${hash}-"`basename "${SYMBOL_ARCHIVE}" | sed 's/\ //g'`
echo "Transferring symbols... ${SYMBOL_ARCHIVE}"
scp -oLogLevel=DEBUG -oRekeyLimit=10M ${SYMBOL_SERVER_PORT:+-P $SYMBOL_SERVER_PORT} \
${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} "${SYMBOL_ARCHIVE}" \
${SYMBOL_SERVER_USER}@${SYMBOL_SERVER_HOST}:"${SYMBOL_SERVER_PATH}/${archive}"
echo "Unpacking symbols on remote host..."
ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \
${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} \
-l ${SYMBOL_SERVER_USER} ${SYMBOL_SERVER_HOST} \
"set -e;
umask 0022;
cd ${SYMBOL_SERVER_PATH};
unzip -n '$archive';
rm -v '$archive';"
if test -n "$POST_SYMBOL_UPLOAD_CMD"; then
echo "${POST_SYMBOL_UPLOAD_CMD} \"${SYMBOL_SERVER_PATH}/${SYMBOL_INDEX_NAME}\""
ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \
${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} \
-l ${SYMBOL_SERVER_USER} ${SYMBOL_SERVER_HOST} \
"${POST_SYMBOL_UPLOAD_CMD} \"${SYMBOL_SERVER_PATH}/${SYMBOL_INDEX_NAME}\""
fi
echo "Symbol transfer completed"