745930 - balrog client puts wrong MARs in blobs

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[[e-mail] (:bhearsum)]

It sends the tinderbox-builds ones instead of nightly, eg:
<updates><update type="minor" version="14.0a1" extensionVersion="14.0a1" buildID="20120416030739"><patch type="complete" URL="http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-central-macosx64/1334570859/firefox-14.0a1.en-US.mac.complete.mar" hashFunction="sha512" hashValue="6e71a75a5124971f54f0fa31626f334f7114566bb6881594a79593ee9aa8a6a214072bb48a6df5e158d9d507634bb52e2e2082b896c378f23304bcf9d0b37499" size="40173819"/></update></updates>

Comment 1

[[e-mail] (:bhearsum)]

looks to be mac only

Comment 2

[Rail Aliiev [:rail]]

$ grep 'http://.*mac.complete.mar' stdio.html
http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2012/04/2012-04-17-03-06-41-mozilla-central/firefox-14.0a1.en-US.mac.complete.mar
http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2012/04/2012-04-17-03-06-41-mozilla-central/firefox-14.0a1.en-US.mac.complete.mar.asc
http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-central-macosx64/1334657201/firefox-14.0a1.en-US.mac.complete.mar.asc

I bet that parse_make_upload uses the last entry:

for m in re.findall("^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar))", ...
and it matches ...firefox-14.0a1.en-US.mac.complete.mar.asc but removes "asc".

I have 2 ways to go:

1) globally change the REGEX to filter out asc files
2) add a work around for mars

Comment 3

[[e-mail] (:bhearsum)]

Unless there's any reason why we want to catch the asc files in the regex, sounds like option #1 is the way to go IMO.

Comment 4

[Rail Aliiev [:rail]]

Attachment: Add trailing CAD

Staging run looks good so far.

Comment 5

[[e-mail] (:bhearsum)]

Comment on attachment 615930 [details] [diff] [review]
Add trailing CAD

Review of attachment 615930 [details] [diff] [review]:
-----------------------------------------------------------------

I'm slightly worried this might break something unrelated, but r+

Comment 6

[Rail Aliiev [:rail]]

Comment on attachment 615930 [details] [diff] [review]
Add trailing CAD

http://hg.mozilla.org/build/buildbotcustom/rev/6447b401ba1f

Let's break the world with *proper* regexes!