1441359 - Ensure language packs have unique version strings per AppVersion/Beta Version

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Justin Wood (:Callek)]

We need to make sure language packs have unique version strings from one release build to the next. This should roughly be equal to Appversion, but we'll need support for beta 1 being different from beta2 (incase we take new string changes) and we'll also need to keep in mind about ESR, which might be special here.

:Pike can you look into this?

Comment 1

[Axel Hecht [:Pike]]

The version in the manifest is $(MOZ_APP_VERSION), that's good enough, right?

There's also a per-locale version inside the manifest, but I doubt we use that on AMO?

Comment 2

[Justin Wood (:Callek)]

(In reply to Axel Hecht [:Pike] from comment #1)
> The version in the manifest is $(MOZ_APP_VERSION), that's good enough, right?

It's not good enough. For example, [Firefox] 60 beta1 app version is "60.0", and it would also be "60.0" for beta 2.

And then again 60.0 for final (and esr too, -I think-).

What we need is a unique version for AMO that can be different between beta's, and ideally between seperate build's even in a single beta (e.g. final gets multiple rc's sometimes)

With things how they are we'd get one chance to upload a langpack between beta 1 and final, and no other changes until the first dot release.

Comment 3

[Axel Hecht [:Pike]]

No idea what would satisfy those criteria.

Comment 4

[Justin Wood (:Callek)]

Attachment: Bug 1441359 - Make langpack version include buildid.

For Automated submission to AMO we need unique language pack versions for every submitted build.

This will produce versions that are not valid for AMO on nightly (61.0a1buildid2018...) but that's ok, we're not ready to
submit these automatically on the nightly channel yet, they do still install fine into Firefox manually.

On beta/release/esr the version will however be ok for AMO "60.0buildid2018..." and will be reasonably unique per push.

This patch has the intent that, outside of automation, users who don't set a buildid get a langpack version without that
specified (rather than a buildid being automatically generated for them).

The releng scriptworker (addonscript) that will do the publishing to AMO will additionally sanity check that the string
'buildid' is present in the version part, so we don't accidentally break this functionality in production.

This patch is also intended to be uplifted to Gecko 60 to support ESR60 needs.

Review commit: https://reviewboard.mozilla.org/r/232642/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/232642/

Comment 5

[Justin Wood (:Callek)]

(In reply to Justin Wood (:Callek) from comment #4)
> Created attachment 8963773 [details]
> Bug 1441359 - Make langpack version include buildid.

After some trial and error and discussion among meetings we've come up with

<milestone.txt>buildid<buildid>  e.g. 61.0a1buildid2018... and 60.0buildid2018... and 60.0.1buildid2018...

And this patch does that, c.f. this try push: https://treeherder.mozilla.org/#/jobs?repo=try&revision=4a89d92eb37839852437f7fc651e573775d92842

Comment 6

[Michael Shal [:mshal]]

Comment on attachment 8963773 [details]
Bug 1441359 - Make langpack version include buildid.

https://reviewboard.mozilla.org/r/232642/#review238232

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/bf285f58e643
Make langpack version include buildid. r=mshal

Comment 8

[Narcis Beleuzu [:NarcisB]]

https://hg.mozilla.org/mozilla-central/rev/bf285f58e643

Comment 9

[Justin Wood (:Callek)]

Comment on attachment 8963773 [details]
Bug 1441359 - Make langpack version include buildid.

Approval Request Comment
[Feature/Bug causing the regression]: Language Pack Signing
[User impact if declined]: Unable to automatically sign langpacks in 60. (Due to AMO conflicts with version number)
[Is this code covered by automated tests?]: No
[Has the fix been verified in Nightly?]: Yes
[Needs manual test from QE? If yes, steps to reproduce]: No
[List of other uplifts needed for the feature/fix]: For the feature Bug 1441358
[Is the change risky?]: No
[Why is the change risky/not risky?]: This merely adds 'buildid' to the language pack version string, if it (buildid) is specified in the encapsulating environment, which is true for automation.
[String changes made/needed]: None

Comment 10

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 8963773 [details]
Bug 1441359 - Make langpack version include buildid.

Fix for langpack signing. Approved for 60.0b11.

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-beta/rev/eead32dddd02