--- a/Makefile.in
+++ b/Makefile.in
@@ -307,18 +307,16 @@ ifdef MOZ_CRASHREPORTER
cd $(DIST)/crashreporter-symbols && \
zip -r9D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt' -x '*test*' -x '*Test*'
endif # MOZ_CRASHREPORTER
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
.PHONY: update-packaging
update-packaging:
$(MAKE) -C tools/update-packaging
.PHONY: pretty-package
--- a/testing/mozharness/configs/b2g/releng-emulator.py
+++ b/testing/mozharness/configs/b2g/releng-emulator.py
@@ -57,21 +57,16 @@ config = {
"translate_hg_to_git": True,
"translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"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",
},
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"is_automation": True,
"repo_mirror_dir": "/builds/git-shared/repo",
"repo_remote_mappings": {
'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
--- a/testing/mozharness/configs/b2g/releng-fota-eng.py
+++ b/testing/mozharness/configs/b2g/releng-fota-eng.py
@@ -57,21 +57,16 @@ config = {
"translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
"target_suffix": "-eng",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"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",
"PATH": "/tools/python27/bin:%(PATH)s",
"B2G_UPDATE_CHANNEL": "default",
},
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"is_automation": True,
--- a/testing/mozharness/configs/b2g/releng-fota-updates.py
+++ b/testing/mozharness/configs/b2g/releng-fota-updates.py
@@ -56,21 +56,16 @@ config = {
"translate_hg_to_git": True,
"translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"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",
},
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"is_automation": True,
"repo_mirror_dir": "/builds/git-shared/repo",
"repo_remote_mappings": {
'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
--- a/testing/mozharness/configs/b2g/releng-otoro-eng.py
+++ b/testing/mozharness/configs/b2g/releng-otoro-eng.py
@@ -57,21 +57,16 @@ config = {
"translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
"target_suffix": "-eng",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"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",
"PATH": "/tools/python27/bin:%(PATH)s",
"B2G_UPDATE_CHANNEL": "default",
},
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"is_automation": True,
--- a/testing/mozharness/configs/b2g/releng-otoro.py
+++ b/testing/mozharness/configs/b2g/releng-otoro.py
@@ -55,21 +55,16 @@ config = {
"translate_hg_to_git": True,
"translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"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",
},
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"is_automation": True,
"repo_mirror_dir": "/builds/git-shared/repo",
"repo_remote_mappings": {
'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
--- a/testing/mozharness/configs/b2g/releng-private-updates.py
+++ b/testing/mozharness/configs/b2g/releng-private-updates.py
@@ -56,21 +56,16 @@ config = {
"translate_hg_to_git": True,
"translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"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",
},
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"is_automation": True,
"repo_mirror_dir": "/builds/git-shared/repo",
"repo_remote_mappings": {
'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
--- a/testing/mozharness/configs/builds/build_pool_specifics.py
+++ b/testing/mozharness/configs/builds/build_pool_specifics.py
@@ -11,42 +11,39 @@ config = {
# but in production we let the self.branch decide via
# self._query_graph_server_branch_name()
"graph_server_branch_name": "MozillaTest",
'graph_server': 'graphs.allizom.org',
"hgtool_base_bundle_urls": [
'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',
'post_upload_extra': ['--bucket-prefix', 'net-mozaws-stage-delivery',
'--url-prefix', 'http://ftp.stage.mozaws.net/',
],
},
"production": {
# if not clobberer_url, only clobber 'abs_work_dir'
# if true: possibly clobber, clobberer
# see PurgeMixin for clobber() conditions
'clobberer_url': 'https://api.pub.build.mozilla.org/clobberer/lastclobber',
'graph_server': 'graphs.mozilla.org',
"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"],
'taskcluster_index': 'index',
},
"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/'],
"tooltool_url": 'http://relengapi/tooltool/',
'upload_env': {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/home/worker/artifacts',
},
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -68,22 +68,16 @@ config = {
'enable_max_vsize': False,
'use_package_as_marfile': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'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',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:/usr/bin',
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -79,22 +79,16 @@ config = {
'stage_platform': 'linux',
'publish_nightly_en_US_routes': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'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',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -78,22 +78,16 @@ config = {
'stage_platform': 'linux64',
'publish_nightly_en_US_routes': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'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',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
@@ -45,22 +45,16 @@ config = {
'platform': 'macosx64',
'stage_platform': 'macosx64',
'publish_nightly_en_US_routes': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'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',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -42,22 +42,16 @@ config = {
'base_name': 'OS X 10.7 %(branch)s',
'platform': 'macosx64',
'stage_platform': 'macosx64',
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'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',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -74,22 +74,16 @@ config = {
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%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': {
# stage_server is dictated from build_pool_specifics.py
'UPLOAD_HOST': '%(stage_server)s',
'UPLOAD_USER': '%(stage_username)s',
'UPLOAD_SSH_KEY': '/c/Users/cltbld/.ssh/%(stage_ssh_key)s',
'UPLOAD_TO_TEMP': '1',
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -72,22 +72,16 @@ config = {
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%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': {
# stage_server is dictated from build_pool_specifics.py
'UPLOAD_HOST': '%(stage_server)s',
'UPLOAD_USER': '%(stage_username)s',
'UPLOAD_SSH_KEY': '/c/Users/cltbld/.ssh/%(stage_ssh_key)s',
'UPLOAD_TO_TEMP': '1',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_graphene.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_graphene.py
@@ -29,17 +29,13 @@ config = {
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
## 64 bit specific
'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',
#######################
}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_horizon.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_horizon.py
@@ -29,17 +29,13 @@ config = {
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
## 64 bit specific
'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',
#######################
}
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_graphene.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_graphene.py
@@ -27,17 +27,13 @@ config = {
'TINDERBOX_OUTPUT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
## 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',
#######################
}
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_horizon.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_horizon.py
@@ -27,17 +27,13 @@ config = {
'TINDERBOX_OUTPUT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
## 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',
#######################
}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_graphene.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_graphene.py
@@ -26,17 +26,13 @@ config = {
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-graphene',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'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',
#######################
}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_horizon.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_horizon.py
@@ -26,17 +26,13 @@ config = {
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-horizon',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'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',
#######################
}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -609,18 +609,18 @@ class BuildScript(BuildbotMixin, PurgeMi
self.buildid = None
self.builduid = None
self.query_buildid() # sets self.buildid
self.query_builduid() # sets self.builduid
self.generated_build_props = False
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
# order to use python modules in PreScriptRun/Action listeners
self.create_virtualenv()
def _pre_config_lock(self, rw_config):
c = self.config
@@ -830,30 +830,23 @@ or run without that action (ie: --no-{ac
self.info("Skipping......")
return
def query_is_nightly_promotion(self):
platform_enabled = self.config.get('enable_nightly_promotion')
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
env['MOZ_BUILD_DATE'] = self.query_buildid()
if self.query_is_nightly() or self.query_is_nightly_promotion():
if self.query_is_nightly():
# nightly promotion needs to set update_channel but not do all the 'IS_NIGHTLY'
deleted file mode 100755
--- a/toolkit/crashreporter/tools/upload_symbols.sh
+++ /dev/null
@@ -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"