818333 - Make confvars.sh for desktop the same across branches where possible

Status: RESOLVED WONTFIX

(Firefox Build System :: General, defect)

Description

[Robert Strong (they/them - no direct email)]

We should be able to remove several of the differences in confvars.sh across nightly, aurora, beta, and release with the configure changes in bug 817723. This will lessen the merge work when merging the branches.

Comment 1

[Robert Strong (they/them - no direct email)]

Attachment: patch rev1

If we go with bug 817723 then we could do this as well to simplify merging.

Comment 2

[Robert Strong (they/them - no direct email)]

Ran this and bug 817723 through try
https://tbpl.mozilla.org/?tree=Try&rev=f4db189551e9&noignore=1

Comment 3

[Robert Strong (they/them - no direct email)]

Comment on attachment 688535 [details] [diff] [review]
patch rev1

With the changes to configure.in from bug 817723 we should be able to simplify the merges for release management by removing the one-off handling in confvars.sh

Comment 4

[Robert Strong (they/them - no direct email)]

Comment on attachment 688535 [details] [diff] [review]
patch rev1

Brian, just want to make sure that you see no problems with this approach

Comment 5

[Brian R. Bondy [:bbondy]]

Comment on attachment 688535 [details] [diff] [review]
patch rev1

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

The only thing I can think of is that I think RelEng or QA use some different release channels for testing individual repos.
Like beta-test or something similar to that.
In that case, the beta-test release channel would get this wrong information:
ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
MAR_CHANNEL_ID=firefox-mozilla-central

Instead of what it should get:
ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
MAR_CHANNEL_ID=firefox-mozilla-beta

Comment 6

[Robert Strong (they/them - no direct email)]

I believe that is already handled in the patch since the channel change is done manually and the beta confvars are already set to that
http://mxr.mozilla.org/mozilla-beta/source/browser/confvars.sh

Release confvars.sh for reference
http://mxr.mozilla.org/mozilla-release/source/browser/confvars.sh

I'll ask for feedback from nthomas as well just in case

Comment 7

[Brian R. Bondy [:bbondy]]

OK thanks, everything else looks good, that's the only thing I'm not sure about.

Comment 8

[Robert Strong (they/them - no direct email)]

Note: this patch removes all of the requirements to edit to confvars for desktop on:
https://wiki.mozilla.org/Release_Management/Merge_Documentation

Comment 9

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 688535 [details] [diff] [review]
patch rev1

>+MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
>+if test "$MOZ_UPDATE_CHANNEL" = "release" -o \
>+        "$MOZ_UPDATE_CHANNEL" = "beta" -o \
>+        "$MOZ_UPDATE_CHANNEL" = "esr"; then
>+  MOZ_BRANDING_DIRECTORY=browser/branding/nightly
>+elif test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
>+  MOZ_BRANDING_DIRECTORY=browser/branding/aurora
>+else
>+  MOZ_BRANDING_DIRECTORY=browser/branding/nightly
>+fi

Looks like you can collapse this to
MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
  MOZ_BRANDING_DIRECTORY=browser/branding/aurora
else
  MOZ_BRANDING_DIRECTORY=browser/branding/nightly
fi

re channels I agree that betatest and releasetest are used at test-time rather than build-time, so it's not a problem here. We do change at compile time for branches like ux, eg the nightly-ux channel, but that will still work fine with the changes here.

Comment 10

[Robert Strong (they/them - no direct email)]

Attachment: patch rev2 - updated to comments

Thanks Nick!

Comment 11

[Mike Hommey [:glandium]]

Comment on attachment 691255 [details] [diff] [review]
patch rev2 - updated to comments

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

::: browser/confvars.sh
@@ +28,5 @@
> +# separated list of values.
> +# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
> +if test "$MOZ_UPDATE_CHANNEL" = "release"; then
> +  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
> +  MAR_CHANNEL_ID=firefox-mozilla-release

You could do
case "$MOZ_UPDATE_CHANNEL" in
release|aurora|esr)
  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-$MOZ_UPDATE_CHANNEL
  MAR_CHANNEL_ID=firefox-mozilla-$MOZ_UPDATE_CHANNEL
  ;;
beta)
  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
  MAR_CHANNEL_ID=firefox-mozilla-beta
  ;;
*)
  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
  MAR_CHANNEL_ID=firefox-mozilla-central
  ;;
esac

Comment 12

[Robert Strong (they/them - no direct email)]

Attachment: patch rev3 - updated to comments

Carrying forward r+

Comment 13

[Robert Strong (they/them - no direct email)]

Pushed to mozilla-inbound
https://hg.mozilla.org/integration/mozilla-inbound/rev/3cfc257e29a5

Comment 14

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/3cfc257e29a5

Comment 15

[Robert Strong (they/them - no direct email)]

akeybl, with this on trunk all I am fairly certain that all of the merge instructions for desktop's confvars.sh no longer apply when merging to aurora. I am fine with uplifting this bug (also requires uplifting bug 817723) to aurora as well if you would like to... beta as well.

Comment 16

[Alex Keybl [:akeybl]]

Comment on attachment 691866 [details] [diff] [review]
patch rev3 - updated to comments

Would love to also get this on Aurora for the 19 merge to beta! Pre-approving for that branch. Thanks rstrong!!

Comment 17

[Robert Strong (they/them - no direct email)]

Pushed to mozilla-aurora
https://hg.mozilla.org/releases/mozilla-aurora/rev/fddab01e981f

Comment 18

[Robert Strong (they/them - no direct email)]

Attachment: aurora patch as checked in

Comment 19

[Robert Strong (they/them - no direct email)]

Turns out that MOZ_UPDATE_CHANNEL isn't defined except for nightly builds so this approach won't work. :( and meh. I'll also back it out of mozilla-central.

Comment 20

[Robert Strong (they/them - no direct email)]

Backed out of mozilla-inbound
https://hg.mozilla.org/integration/mozilla-inbound/rev/1ac81b33e492

Unassigning for now but I will take it again if I can see a way to accomplish this.

Comment 21

[Ed Morley [:emorley]]

Merge of backout:
https://hg.mozilla.org/mozilla-central/rev/1ac81b33e492

Comment 22

[Kim Moir [:kmoir] ET]

triaging, rstrong is this bug still relevant in active development streams or can it be closed?

Comment 23

[Robert Strong (they/them - no direct email)]

Might as well close it since the process is working well without this.