From 3c0460b85b63a19f24ab8de760b207effd058caa Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Fri, 1 Apr 2016 13:31:02 +0000 Subject: [PATCH] Bug 1261045: remove unused MOZ_SYMBOLS_EXTRA_BUILDID; r=ted.mielczarek MozReview-Commit-ID: 6vX87lAGxF6 --HG-- extra : rebase_source : 119cd9bdbf1883523da804a66b24c9629470a6c5 --- Makefile.in | 6 +---- .../configs/builds/branch_specifics.py | 5 ---- .../builds/releng_base_linux_64_builds.py | 1 - .../builds/releng_base_mac_64_builds.py | 1 - .../builds/releng_base_mac_64_cross_builds.py | 1 - .../builds/releng_base_windows_64_builds.py | 1 - .../releng_sub_linux_configs/64_artifact.py | 1 - .../64_stat_and_opt.py | 1 - .../configs/single_locale/macosx64.py | 1 - .../mozharness/mozilla/building/buildbase.py | 25 ------------------- .../mozharness/scripts/fx_desktop_build.py | 1 - .../scripts/builder/build-linux.sh | 1 - 12 files changed, 1 insertion(+), 44 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4cc9aff3c4b2..a3d8b0efb3c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -279,12 +279,8 @@ SYM_STORE_SOURCE_DIRS := $(topsrcdir) include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk -ifdef MOZ_SYMBOLS_EXTRA_BUILDID -EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID) -endif - SYMBOL_INDEX_NAME = \ - $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)$(EXTRA_BUILDID)-symbols.txt + $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt buildsymbols: ifdef MOZ_CRASHREPORTER diff --git a/testing/mozharness/configs/builds/branch_specifics.py b/testing/mozharness/configs/builds/branch_specifics.py index 3581a13f76e4..f892548b58d3 100644 --- a/testing/mozharness/configs/builds/branch_specifics.py +++ b/testing/mozharness/configs/builds/branch_specifics.py @@ -34,7 +34,6 @@ config = { "repo_path": 'mozilla-central', "update_channel": "nightly", "graph_server_branch_name": "Firefox", - 'use_branch_in_symbols_extra_buildid': False, 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net', }, 'mozilla-release': { @@ -42,7 +41,6 @@ config = { 'repo_path': 'releases/mozilla-release', 'update_channel': 'release', 'branch_uses_per_checkin_strategy': True, - 'use_branch_in_symbols_extra_buildid': False, 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net', 'platform_overrides': { 'linux': { @@ -112,7 +110,6 @@ config = { 'repo_path': 'releases/mozilla-beta', 'update_channel': 'beta', 'branch_uses_per_checkin_strategy': True, - 'use_branch_in_symbols_extra_buildid': False, 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net', 'platform_overrides': { 'linux': { @@ -181,7 +178,6 @@ config = { 'repo_path': 'releases/mozilla-aurora', 'update_channel': 'aurora', 'branch_uses_per_checkin_strategy': True, - 'use_branch_in_symbols_extra_buildid': False, 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net', }, 'try': { @@ -192,7 +188,6 @@ config = { 'to_tinderbox_dated': False, 'include_post_upload_builddir': True, 'release_to_try_builds': True, - 'use_branch_in_symbols_extra_buildid': False, 'stage_server': 'upload.trybld.productdelivery.prod.mozaws.net', 'stage_username': 'trybld', 'stage_ssh_key': 'trybld_dsa', diff --git a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py index d766691fe9d5..a904d380c25c 100644 --- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py @@ -77,7 +77,6 @@ config = { 'platform': 'linux64', 'stage_platform': 'linux64', 'publish_nightly_en_US_routes': True, - 'use_platform_in_symbols_extra_buildid': True, 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_AUTOMATION': '1', diff --git a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py index 4c84dc059d87..18447f096f12 100644 --- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py @@ -45,7 +45,6 @@ config = { 'platform': 'macosx64', 'stage_platform': 'macosx64', 'publish_nightly_en_US_routes': True, - 'use_platform_in_symbols_extra_buildid': True, 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_AUTOMATION': '1', diff --git a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py index 8211acaf1182..27943ea7ab89 100644 --- 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,7 +42,6 @@ config = { 'base_name': 'OS X 10.7 %(branch)s', 'platform': 'macosx64', 'stage_platform': 'macosx64', - 'use_platform_in_symbols_extra_buildid': True, 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_AUTOMATION': '1', diff --git a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py index f4a128ad88dc..0bdf600fe5d3 100644 --- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py @@ -68,7 +68,6 @@ config = { 'stage_platform': 'win64', 'publish_nightly_en_US_routes': True, 'env': { - 'MOZ_SYMBOLS_EXTRA_BUILDID': 'win64', 'MOZ_AUTOMATION': '1', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZ_CRASHREPORTER_NO_REPORT': '1', diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py index d170e65da2c4..f350b51516d7 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py @@ -34,7 +34,6 @@ config = { 'platform': 'linux64', 'stage_platform': 'linux64', 'publish_nightly_en_US_routes': False, - 'use_platform_in_symbols_extra_buildid': True, 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_AUTOMATION': '1', diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py index d480f0608307..496d89f964bc 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py @@ -34,7 +34,6 @@ config = { 'platform': 'linux64', 'stage_platform': 'linux64-st-an', 'publish_nightly_en_US_routes': False, - 'use_platform_in_symbols_extra_buildid': True, 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_AUTOMATION': '1', diff --git a/testing/mozharness/configs/single_locale/macosx64.py b/testing/mozharness/configs/single_locale/macosx64.py index 10a171cfc03a..ceafa8398735 100644 --- a/testing/mozharness/configs/single_locale/macosx64.py +++ b/testing/mozharness/configs/single_locale/macosx64.py @@ -11,7 +11,6 @@ config = { "MOZ_OBJDIR": "obj-l10n", "EN_US_BINARY_URL": "%(en_us_binary_url)s", "MOZ_UPDATE_CHANNEL": "%(update_channel)s", - "MOZ_SYMBOLS_EXTRA_BUILDID": "macosx64", "MOZ_PKG_PLATFORM": "mac", # "IS_NIGHTLY": "yes", "DIST": "%(abs_objdir)s", diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index ef7452e39e6b..63f1ddfaa3bd 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -949,28 +949,6 @@ or run without that action (ie: --no-{action})" check_test_env[env_var] = env_value % dirs return check_test_env - def _query_moz_symbols_buildid(self): - # this is a bit confusing but every platform that make - # uploadsymbols may or may not include a - # MOZ_SYMBOLS_EXTRA_BUILDID in the env and the value of this - # varies. - # logic goes: - # If it's the release branch, we only include it for - # 64bit platforms and we use just the platform as value. - # If it's a project branch off m-c, we include only the branch - # for the value on 32 bit platforms and we include both the - # platform and branch for 64 bit platforms - c = self.config - moz_symbols_extra_buildid = '' - if c.get('use_platform_in_symbols_extra_buildid'): - moz_symbols_extra_buildid += self.stage_platform - if c.get('use_branch_in_symbols_extra_buildid'): - if moz_symbols_extra_buildid: - moz_symbols_extra_buildid += '-%s' % (self.branch,) - else: - moz_symbols_extra_buildid = self.branch - return moz_symbols_extra_buildid - def _query_who(self): """ looks for who triggered the build with a change. @@ -1629,9 +1607,6 @@ or run without that action (ie: --no-{action})" """builds application.""" env = self.query_build_env() env.update(self.query_mach_build_env()) - symbols_extra_buildid = self._query_moz_symbols_buildid() - if symbols_extra_buildid: - env['MOZ_SYMBOLS_EXTRA_BUILDID'] = symbols_extra_buildid # XXX Bug 1037883 - mozconfigs can not find buildprops.json when builds # are through mozharness. This is not pretty but it is a stopgap diff --git a/testing/mozharness/scripts/fx_desktop_build.py b/testing/mozharness/scripts/fx_desktop_build.py index 7c01ff57311f..04b32b91661d 100755 --- a/testing/mozharness/scripts/fx_desktop_build.py +++ b/testing/mozharness/scripts/fx_desktop_build.py @@ -71,7 +71,6 @@ class FxDesktopBuild(BuildScript, object): ], 'stage_product': 'firefox', 'platform_supports_post_upload_to_latest': True, - 'use_branch_in_symbols_extra_buildid': True, 'latest_mar_dir': '/pub/mozilla.org/firefox/nightly/latest-%(branch)s', 'compare_locales_repo': 'https://hg.mozilla.org/build/compare-locales', 'compare_locales_rev': 'RELEASE_AUTOMATION', diff --git a/testing/taskcluster/scripts/builder/build-linux.sh b/testing/taskcluster/scripts/builder/build-linux.sh index ff86c779777d..6237060271be 100644 --- a/testing/taskcluster/scripts/builder/build-linux.sh +++ b/testing/taskcluster/scripts/builder/build-linux.sh @@ -35,7 +35,6 @@ fail() { export MOZ_CRASHREPORTER_NO_REPORT=1 export MOZ_OBJDIR=obj-firefox -export MOZ_SYMBOLS_EXTRA_BUILDID=linux64 export TINDERBOX_OUTPUT=1 # use "simple" package names so that they can be hard-coded in the task's