1175533 - Tracking bug for June-29-2015 migration work

Status: RESOLVED FIXED

(Release Engineering :: Release Requests, defect)

Description

[Rail Aliiev [:rail]]

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

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

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

Comment 1

[Rail Aliiev [:rail]]

Attachment: release-version-bump.diff

Comment 2

[Rail Aliiev [:rail]]

Attachment: central_to_aurora_changes.diff

* Address branding changes made in m-c in bug 1157289:
  - no need to change MOZ_BRANDING_DIRECTORY
  - replace --with-branding in Firefox mozconfigs to point to aurora branding directory
* Unify replacements. cetnral_to_aurora only for now. I'll port other functions as well after this merge day.
* Force tag with *_END because we already it because of all magic with 38.0.5
* For the same reason, handle the case when all tags are still visible after debugsetparent is used


This is what it generates: https://gist.github.com/rail/189ff7da2f181265a68e

Comment 3

[Rail Aliiev [:rail]]

Attachment: central_to_aurora_changes.diff

+ version_about.txt bump handler

Comment 4

[Rail Aliiev [:rail]]

Comment on attachment 8623702 [details] [diff] [review]
release-version-bump.diff

https://hg.mozilla.org/build/buildbot-configs/rev/fbd8ed3fde6a

Comment 5

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

Comment on attachment 8624703 [details] [diff] [review]
central_to_aurora_changes.diff

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

r+ with a couple of fixes.

::: configs/merge_day/central_to_aurora.py
@@ +8,5 @@
> +        "ac_add_options --with-branding=mobile/android/branding/aurora")
> +        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"]

Lets add l10n-nightly back in here.

::: scripts/merge_day/gecko_migration.py
@@ +332,3 @@
>          for f in version_files:
>              self.replace(os.path.join(cwd, f), "%s.0%s" % (curr_version, curr_suffix),
>                           "%s.0%s" % (next_version, next_suffix))

This will work for central -> aurora, but not aurora -> beta or beta -> release. A bridge to be crossed later ?

Comment 6

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

s/couple of/single/

Comment 7

[Rail Aliiev [:rail]]

Comment on attachment 8624703 [details] [diff] [review]
central_to_aurora_changes.diff

https://hg.mozilla.org/build/mozharness/rev/934f1097a770

Comment 8

[Rail Aliiev [:rail]]

(In reply to Nick Thomas [:nthomas] from comment #5)

> ::: scripts/merge_day/gecko_migration.py
> @@ +332,3 @@
> >          for f in version_files:
> >              self.replace(os.path.join(cwd, f), "%s.0%s" % (curr_version, curr_suffix),
> >                           "%s.0%s" % (next_version, next_suffix))
> 
> This will work for central -> aurora, but not aurora -> beta or beta ->
> release. A bridge to be crossed later ?

I'm going to prep another patch after the merge day to handle aurora-to-beta for the next merge day.

Comment 9

[Jordan Lund (:jlund)]

Attachment: 150629_migration_gecko_bump_for_stablization_branches-bbot-cfgs.patch

Comment 10

[Jordan Lund (:jlund)]

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

Comment 11

[Jordan Lund (:jlund)]

I believe this is all done.

bouncer entries for central updated on thursday

bouncer entries and unthrottling of aurora happened today.