Rail Aliiev [:rail] Reporter
	Description • 9 years ago

+++ This bug was initially created as a clone of Bug #1175533 +++

	Rail Aliiev [:rail] Reporter
	Comment 1 • 9 years ago

Branding used per product:

Fennec (see http://hg.mozilla.org/mozilla-central/file/c26dbd63604d/mobile/android/branding):
 - aurora: aurora
 - beta: beta
 - release: official

Firefox (see http://hg.mozilla.org/mozilla-central/file/c26dbd63604d/browser/branding):
 - aurora: aurora
 - beta: nightly
 - release: nightly (no replacement required)

	Rail Aliiev [:rail] Reporter
	Comment 2 • 9 years ago

+ handle https://hg.mozilla.org/releases/mozilla-aurora/rev/42f1bdd8b0da
+ ESR

	Rail Aliiev [:rail] Reporter
	Comment 3 • 9 years ago

Also need to address changes in https://bugzilla.mozilla.org/show_bug.cgi?id=1178785

	Nick Thomas [:nthomas] (UTC+12)
	Comment 4 • 9 years ago

Comment on attachment 8627450 [details] [diff] [review]
merge_replacements.diff

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

::: configs/merge_day/beta_to_release.py
@@ +7,5 @@
> +        "ac_add_options --with-branding=mobile/android/branding/official")
> +        for d in ["mobile/android/config/mozconfigs/android-api-11/",
> +                  "mobile/android/config/mozconfigs/android-api-9-10-constrained/",
> +                  "mobile/android/config/mozconfigs/android-x86/"]
> +        for f in ["debug", "nightly", "l10n-nightly"]

I think you need to add l10n-release and release back into this, r+ with that done.

::: configs/merge_day/central_to_aurora.py
@@ +49,5 @@
>           "MAR_CHANNEL_ID=firefox-mozilla-central",
>           "MAR_CHANNEL_ID=firefox-mozilla-aurora"),
> +        ("browser/config/mozconfigs/macosx-universal/nightly",
> +         "ac_add_options --with-branding=browser/branding/nightly",
> +         "ac_add_options --with-branding=browser/branding/aurora"),

Would be good if this was in a consistent place for c->a and a->b merge configs, for easier diffing. eg first in this list.

	Rail Aliiev [:rail] Reporter
	Comment 5 • 9 years ago

Comment on attachment 8627450 [details] [diff] [review]
merge_replacements.diff

https://hg.mozilla.org/build/mozharness/rev/f59b5364984e

I also added "l10n-mozconfig" to avoid bug 1178785 in the future.

	Jordan Lund (:jlund)
	Comment 6 • 9 years ago

mozharness production tag moved to: https://hg.mozilla.org/build/mozharness/rev/production

	Rail Aliiev [:rail] Reporter
	Comment 7 • 9 years ago

version bump in https://hg.mozilla.org/build/buildbot-configs/rev/c7394abf3d9d

	Rail Aliiev [:rail] Reporter
	Comment 8 • 9 years ago

In production: https://hg.mozilla.org/build/buildbot-configs/rev/c7394abf3d9d

	Jordan Lund (:jlund)
	Comment 9 • 9 years ago

bumps the remaining release branches for merge day

	Jordan Lund (:jlund)
	Comment 10 • 9 years ago

Comment on attachment 8645507 [details] [diff] [review]
150809_1178507_aug_10_migration-gecko_version_bump-bbot-cfgs.patch

thanks

	Jordan Lund (:jlund)
	Comment 11 • 9 years ago

In production: https://hg.mozilla.org/build/buildbot-configs/rev/67329f8dda55

	Jordan Lund (:jlund)
	Comment 12 • 9 years ago

(stabilizing branches) mergeday work completed:
* m-a->m-b migration pushed
* m-c->m-a migration pushed
* wikimo version templates have been updated
* aurora nightlies are in progress
* aurora updates are frozen (this was done by hand because of 1163998)
* b2g branches are tagged

work still to be done:
* Bump bouncer entry versions (waiting for new set of central nightlies)
* Unthrottle Aurora nightly updates (wait for relman request near end of week)

	Nick Thomas [:nthomas] (UTC+12)
	Comment 13 • 9 years ago

Comment on attachment 8627450 [details] [diff] [review]
merge_replacements.diff

We'll need a follow up for this.

1, for aurora -> beta: l10n-mozconfig need "ac_add_options --with-branding=browser/branding/aurora" removed with nothing put in

2, for central -> aurora: browser/config/mozconfigs/macosx-universal/l10n-mozconfig needs bumping branding to aurora

	Nick Thomas [:nthomas] (UTC+12)
	Comment 14 • 9 years ago

(In reply to Nick Thomas [:nthomas] from comment #13)
> 2, for central -> aurora:
> browser/config/mozconfigs/macosx-universal/l10n-mozconfig needs bumping
> branding to aurora

Bug 1193941 handled this bit.

	Jordan Lund (:jlund)
	Comment 15 • 9 years ago

> work still to be done:
> * Bump bouncer entry versions (waiting for new set of central nightlies)
> * Unthrottle Aurora nightly updates (wait for relman request near end of
> week)

this is done now. I believe this migration is complete