Hit this today during the 3.6.13 release. As part of the make download target, we create the initial signed-build$(BUILD)/ dir where we'll subsequently be doing all of the actual signing work, and then rsync all the mac and linux builds over to it since they don't need authenticode signing. We miss the partner repacks for mac and linux though, because our rsync specifically --excludes the unsigned/ dir where the win32 builds live. Unfortunately *all* the partner repacks live under there too. The win32 partner repacks get signed and staged normally as part of the signing process. We just need an extra rsync to move over any mac/linux partner repack repacks. Patch coming up.

Comment on attachment 496572 [details] [diff] [review] Extra rsync for mac/linux partner repacks >+ # Make sure we copy over partner repacks for linux/mac too. >+ rsync -av --exclude '*win32*' unsigned-build(BUILD)/partner-repacks/ signed-build$(BUILD)/partner-repacks I tried this myself on keystage and ran into some problems. I think you wanted: >+ # Make sure we copy over partner repacks for linux/mac too. >+ rsync -av --exclude '**win32*' unsigned-build(BUILD)/unsigned/partner-repacks/ signed-build$(BUILD)/partner-repacks AFAIK, we need the double wildcard so we don't try to match win32 to just the partner name (* stops scanning when it hits a slash), and we want to look in unsigned-build<num>/unsigned, since that's what's getting excluded in the previous rsync step.

Now featuring the correct directory depth! (In reply to comment #2) > AFAIK, we need the double wildcard so we don't try to match win32 to just the > partner name (* stops scanning when it hits a slash), and we want to look in > unsigned-build<num>/unsigned, since that's what's getting excluded in the > previous rsync step. There's only one, chinapack-win32, which is windows-only anyway, hence the name.

Comment on attachment 496698 [details] [diff] [review] Extra rsync for mac/linux partner repacks, v2 >+ rsync -av --exclude '*win32*' unsigned-build(BUILD)/unsigned/partner-repacks/ signed-build$(BUILD)/partner-repacks r+ except it needs '$' in '...unsigned-build(BUILD)/unsigned/partner-repacks...'

Comment on attachment 496698 [details] [diff] [review] Extra rsync for mac/linux partner repacks, v2 Checked in with nit fixed: https://hg.mozilla.org/build/tools/rev/98fe13e10def

Going back and testing my changes against 3.5.16, the partner repack rsync causes the download step to fail if partner repacks aren't present on that branch. Patch coming up.

Here's an approach I've gotten to work in staging. Alternately we could just pass another arg on the command-line, but I'd prefer not to have different args for 3.6 vs. 3.5. Suggestions welcome.

Comment on attachment 496929 [details] [diff] [review] Check branch (from version) before trying to sync partner repacks Could we use something like if [ -d unsigned$(BUILD)/unsigned/partner-repacks/ ]; then rsync ... fi ? My patch in https://bugzilla.mozilla.org/show_bug.cgi?id=558464 gets us verification of the partner-repack deliverables for free, so that doesn't need to be a concern. This saves having to provide another parameter to the Makefile

(In reply to comment #8) > Could we use something like > > if [ -d unsigned$(BUILD)/unsigned/partner-repacks/ ]; then > rsync ... > fi Good call, much simpler.

And now with the correct path.

Comment on attachment 497676 [details] [diff] [review] Rsync partner-repacks dir if present, v2 lgtm :)

Comment on attachment 497676 [details] [diff] [review] Rsync partner-repacks dir if present, v2 http://hg.mozilla.org/build/tools/rev/67fe2371598e