1048890 - update partner repack scripts to cope with new format after mac signing changes

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Other, defect)

Description

[[e-mail] (:bhearsum)]

The layout of our apps is going to change with bug 1046306 in a way that will break existing partner builds. We need to make sure we update our scripts to deal with the new layout.

spohl, can you give the details?

Comment 1

[Stephen A Pohl [:spohl]]

The 'distribution' directory will now live in:
*.app/MozResources

The previous location was:
*.app/Contents/MacOS

See bug 1047738 for the necessary client side changes.

Comment 2

[[e-mail] (:bhearsum)]

Attachment: try to update mac partner script, untested

This looks like it should be simple. However, I'm confused about the loop at the start of this method. It seems to imply that there are files _outside_ of distribution that are used in partner builds. That doesn't seem right based on the layout of partner configs like https://github.com/mozilla/build-partner-repacks/tree/master/partners/aol/distribution. I'm guessing that it's legacy? If not, bug 1047738 will need additional work.

Comment 3

[Chris Cooper [:coop] (he/him)]

Comment on attachment 8467824 [details] [diff] [review]
try to update mac partner script, untested

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

::: scripts/partner-repacks.py
@@ +416,5 @@
>          for i in ['distribution', 'extensions', 'searchplugins']:
>              full_path = path.join(self.full_partner_path, i)
>              if path.exists(full_path):
>                  cp_cmd = "cp -r %s %s" % (full_path,
> +                  path.join("stage", "Firefox.app", "MozResources"))

Will we ever need to repackage in the old format, i.e. do we want some kind of global flag that would allow us to revert back to the old dir structure?

Comment 4

[[e-mail] (:bhearsum)]

(In reply to Chris Cooper [:coop] from comment #3)
> Comment on attachment 8467824 [details] [diff] [review]
> try to update mac partner script, untested
> 
> Review of attachment 8467824 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: scripts/partner-repacks.py
> @@ +416,5 @@
> >          for i in ['distribution', 'extensions', 'searchplugins']:
> >              full_path = path.join(self.full_partner_path, i)
> >              if path.exists(full_path):
> >                  cp_cmd = "cp -r %s %s" % (full_path,
> > +                  path.join("stage", "Firefox.app", "MozResources"))
> 
> Will we ever need to repackage in the old format, i.e. do we want some kind
> of global flag that would allow us to revert back to the old dir structure?

After we ship our first release with the new package layout, I don't think so. However, I think we will need to support both because we'll need the ability to chemspill while this change is on Beta.

Thanks for the catch, I'll make this possible, and we can rip out the old format later.

Comment 5

[[e-mail] (:bhearsum)]

Attachment: make partner repack script with old and new formats

I tested this with the old style by repeating the steps used for the 31.0 partner repacks. Then I tested the new style by overriding the dmg that gets downloaded with one from Oak (where spohl has been pushing his patches). Everything seemed to work fine!

Comment 6

[[e-mail] (:bhearsum)]

Thanks for the quick review.

Comment 7

[Hector Zhao [:hectorz]]

IIUC, in bug 1047738, the new home for distribution directory is Contents/Resources instead of MozResouces?

Comment 8

[[e-mail] (:bhearsum)]

(In reply to Hector Zhao [:hectorz] from comment #7)
> IIUC, in bug 1047738, the new home for distribution directory is
> Contents/Resources instead of MozResouces?

That's right.