677116 - Fix naming of Win64 symbols manifests

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: [buidlbot-configs]

In bug 677033 we noticed that 'make buildsymbols' on win32 and win64 produce symbol manifests which are named the same, eg 
  firefox-8.0a1-WINNT-20110805030744-symbols.txt
so they stomp on each other. That breaks cleaning up nightly symbols because we can't identify where files come from.

There are a couple of options here. This patch fixes the win64/win32 name collision on m-c nightlies, and mostly set us up for running win64 on other branches, on the buildbot side. We'd end up with 
     firefox-8.0a1-WINNT-20110806040210-symbols.txt
 --> firefox-8.0a1-WINNT-20110806040210-win64-symbols.txt

But you can see in config.py we jump through a bunch of hoops to set MOZ_SYMBOLS_EXTRA_BUILDID to give platforms and branches unique names. We could avoid a lot of that if we set a better platform than 'Linux' or 'WINNT' near 
  http://hg.mozilla.org/mozilla-central/file/eef25ec2d58e/Makefile.in#l159
ie OS_TARGET isn't specific enough. 

We've just included package-name.mk, so MOZ_PKG_PLATFORM is available (win32 vs win64-x86_64), or we could use TARGET_XPCOM_ABI (x86-msvc vs x86_64-msvc). I think we should also always include the branch name too - so we could end up with
     firefox-8.0a1-WINNT-20110806040210-symbols.txt
 --> firefox-8.0a1-x86_64-msvc-20110806040210-mozilla-central-symbols.txt

     firefox-8.0a1-WINNT-20110806040210-fx-team-symbols.txt
 --> firefox-8.0a1-x86-msvc-20110806040210-fx-team-symbols.txt

I'd be interested to know how the cleanup script would cope with that sort of transition.

Comment 1

[(not currently active) Ted Mielczarek]

Yeah, the package naming defaults could certainly use an update. They were sufficient back when we started, but not at all now. I was thinking it ought to just be $OS-$CPU. I think if we just tacked -$CPU onto the end it wouldn't break anything:
http://hg.mozilla.org/build/tools/file/tip/buildfarm/breakpad/cleanup-breakpad-symbols.py#l118

Comment 2

[Armen [:armenzg]]

I put the patch to the test on staging.

Comment 3

[Armen [:armenzg]]

I am grabbing a production slave since mw64-ix-slave01 failed compiling (I am afraid is different than production slaves) and the 13 slaves on the winbuild network right now are not useful (bug 677992).

Comment 4

[Armen [:armenzg]]

/bin/sh /e/builds/moz2_slave/m-cen-w64-ntly/build/toolkit/crashreporter/tools/upload_symbols.sh firefox-8.0a1-WINNT-20110812142819-win64-symbols.txt "./dist/firefox-8.0a1.en-US.win64-x86_64.crashreporter-symbols-full.zip"

Looks good?

Instead of this:
/bin/sh /e/builds/moz2_slave/m-cen-w64-ntly/build/toolkit/crashreporter/tools/upload_symbols.sh firefox-8.0a1-WINNT-20110815030738-symbols.txt "./dist/firefox-8.0a1.en-US.win64-x86_64.crashreporter-symbols-full.zip"

Comment 5

[(not currently active) Ted Mielczarek]

Yeah, that looks good. Thanks!

Comment 6

[Armen [:armenzg]]

This got landed with:
http://hg.mozilla.org/build/buildbot-configs/rev/463457bad080