Revert "cbuildbot: enable deduping of uploaded symbols"
This reverts commit bbb594bee0ad61c67ff960ce7641750324c07211.
This is a bit flaky atm, so turn it off in the branch so we don't
break release builds.
BUG=chromium:355843
TEST=`./buildbot/run_tests` pass
Change-Id: Id358f6420ab57083856e61cb3467e6a3c8b10208
Reviewed-on: https://chromium-review.googlesource.com/198250
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/buildbot/cbuildbot_commands.py b/buildbot/cbuildbot_commands.py
index bde5042..9276ecf 100644
--- a/buildbot/cbuildbot_commands.py
+++ b/buildbot/cbuildbot_commands.py
@@ -1373,7 +1373,7 @@
def UploadSymbols(buildroot, board, official, cnt, failed_list):
"""Upload debug symbols for this build."""
- log_cmd = ['upload_symbols', '--board', board, '--dedupe']
+ log_cmd = ['upload_symbols', '--board', board]
if failed_list is not None:
log_cmd += ['--failed-list', str(failed_list)]
if official:
@@ -1382,15 +1382,10 @@
log_cmd += ['--upload-limit', str(cnt)]
cros_build_lib.Info('Running: %s' % cros_build_lib.CmdToStr(log_cmd))
- if official:
- dedupe_namespace = upload_symbols.OFFICIAL_DEDUPE_NAMESPACE
- else:
- dedupe_namespace = upload_symbols.STAGING_DEDUPE_NAMESPACE
-
ret = upload_symbols.UploadSymbols(
board=board, official=official, upload_limit=cnt,
root=os.path.join(buildroot, constants.DEFAULT_CHROOT_DIR),
- failed_list=failed_list, dedupe_namespace=dedupe_namespace)
+ failed_list=failed_list)
if ret:
# TODO(davidjames): Convert this to a fatal error.
# See http://crbug.com/212437
