Closed Bug 1720389 Opened 3 years ago Closed 3 years ago

Add IS_ESR to AppConstants

Categories

(Firefox :: General, enhancement, P3)

enhancement

Tracking

()

VERIFIED FIXED
92 Branch
Tracking Status
firefox91 --- verified
firefox92 --- verified

People

(Reporter: mkaply, Assigned: mkaply)

References

Details

Attachments

(1 file)

Now that we have a build constant for ESR, we should add it to AppConstants so we can properly check for ESR (instead of using the version or channel).

This bug will also cover fixing the various places where we use ESR incorrectly.

See Also: → 1720776
See Also: 1720776

So in looking at this more and in discussion with Julian, we should figure out a way to force IS_ESR via mozconfig for pre ESR builds.

https://searchfox.org/mozilla-central/source/taskcluster/ci/build/kind.yml

This will solve a longstanding problem we've had where we have ESR test failures until the version explicitly switches to have esr at the end.

This should solve the other test related bugs.

glandium: any thoughts on the last comment?

Flags: needinfo?(mh+mozilla)

(In reply to Mike Kaply [:mkaply] from comment #2)

So in looking at this more and in discussion with Julian, we should figure out a way to force IS_ESR via mozconfig for pre ESR builds.

Just change the version in config/milestone.txt and browser/config/version*.txt

Flags: needinfo?(mh+mozilla)

We mean in automation before the version changes.

Basically we want a way to fake ESR for testing purposes without having to switch the versions.

switching the versions is how it's done for beta and release, why not esr?

switching the versions is how it's done for beta and release, why not esr?

Because ESR lives on the beta branch until the very end of the beta cycle.

The switch to the version number is done at the very end of the beta cycle when we branch the ESR.

I mean, central is regularly tested as beta and release on try by changing the versions.

The difference is that beta and release have the "right" version for their entire lifetime. On esr, there's a few weeks when it's first set up where we get spurious test failures because it's in sync with the corresponding beta (i.e. with display version 91.0bX). So we figured a way to tell the build system to treat it as an esr build without source changes would be useful, to avoid having to ignore those perma failures until the actual version bump (or doing the version bump early, which would mean a merge commit with a conflict every time).

Attachment #9232197 - Attachment description: Bug 1720389 - Add ESR to AppConstants. r?glandium! → Bug 1720389 - Add IS_ESR to AppConstants and rename ESR #ifdef to MOZ_ESR. r?glandium!
Pushed by mozilla@kaply.com:
https://hg.mozilla.org/integration/autoland/rev/79b032db65f0
Add IS_ESR to AppConstants and rename ESR #ifdef to MOZ_ESR. r=glandium
Blocks: 1712661
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → 92 Branch

Follow-up on comment 2 and following, as mentioned on matrix: we could reuse https://phabricator.services.mozilla.com/D29917.

Comment on attachment 9232197 [details]
Bug 1720389 - Add IS_ESR to AppConstants and rename ESR #ifdef to MOZ_ESR. r?glandium!

ESR Uplift Approval Request

  • If this is not a sec:{high,crit} bug, please state case for ESR consideration: fix was created specifically for ESR, we will need this to get builds on ESR.
  • User impact if declined:
  • Fix Landed on Version:
  • Risk to taking this patch: Low
  • Why is the change risky/not risky? (and alternatives if risky):
  • String or UUID changes made by this patch:
Attachment #9232197 - Flags: approval-mozilla-esr91?

Comment on attachment 9232197 [details]
Bug 1720389 - Add IS_ESR to AppConstants and rename ESR #ifdef to MOZ_ESR. r?glandium!

Beta/Release Uplift Approval Request

  • User impact if declined: windows builds are failing on esr91, when beta goes to release, this will become esr91.
  • Is this code covered by automated tests?: Yes
  • Has the fix been verified in Nightly?: Yes
  • Needs manual test from QE?: Yes
  • If yes, steps to reproduce:
  • List of other uplifts needed: None
  • Risk to taking this patch: Low
  • Why is the change risky/not risky? (and alternatives if risky):
  • String changes made/needed:
Attachment #9232197 - Flags: approval-mozilla-esr91? → approval-mozilla-beta?

Comment on attachment 9232197 [details]
Bug 1720389 - Add IS_ESR to AppConstants and rename ESR #ifdef to MOZ_ESR. r?glandium!

Approved for 91 beta 7, thanks.

Attachment #9232197 - Flags: approval-mozilla-beta? → approval-mozilla-beta+
Flags: qe-verify+
QA Whiteboard: [qa-triaged]

The issue is verified fixed on Fx91.0b7 and latest nightly Fx92.0a1 on Windows 10 an Ubuntu 20.04. The builds list the 'false' value when entering AppConstants.IS_ESR in the browser toolbox console.

** Note: if the Appconstants is listed as undefined, run the following snipet in the toolbox console:

var { AppConstants } = ChromeUtils.import(
  "resource://gre/modules/AppConstants.jsm"
);
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: