Tracking bug for 21-jul-2014 migration work

RESOLVED FIXED

Status

Release Engineering
General Automation
RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: aki, Assigned: aki)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(13 attachments, 1 obsolete attachment)

898 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
1.95 KB, patch
rail
: review+
Details | Diff | Splinter Review
1.03 KB, patch
rail
: review+
Details | Diff | Splinter Review
9.64 KB, patch
rail
: review+
Details | Diff | Splinter Review
1009 bytes, patch
pmoore
: review+
Details | Diff | Splinter Review
69.86 KB, patch
hwine
: review+
Details | Diff | Splinter Review
3.67 KB, patch
hwine
: review+
Details | Diff | Splinter Review
2.76 KB, patch
rail
: review+
Details | Diff | Splinter Review
3.48 KB, patch
rail
: review+
Details | Diff | Splinter Review
4.69 KB, patch
rail
: review+
Details | Diff | Splinter Review
2.74 KB, patch
rail
: review+
Details | Diff | Splinter Review
4.57 KB, patch
hwine
: review+
Details | Diff | Splinter Review
764 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
Comment hidden (empty)

Updated

3 years ago
Depends on: 1022909
(Assignee)

Updated

3 years ago
Assignee: nobody → aki
(Assignee)

Updated

3 years ago
Depends on: 1022907
(Assignee)

Comment 1

3 years ago
Created attachment 8453972 [details] [diff] [review]
bump_release_version
Attachment #8453972 - Flags: review?(hwine)
(Assignee)

Updated

3 years ago
Depends on: 1037107
(Assignee)

Updated

3 years ago
Depends on: 1037124
(Assignee)

Updated

3 years ago
Depends on: 1037144
Attachment #8453972 - Flags: review?(hwine) → review+
(Assignee)

Comment 2

3 years ago
Comment on attachment 8453972 [details] [diff] [review]
bump_release_version

https://hg.mozilla.org/build/buildbot-configs/rev/d3b916ef173d
Attachment #8453972 - Flags: checked-in+
(Assignee)

Updated

3 years ago
Depends on: 1038282
(Assignee)

Comment 3

3 years ago
#r-d convo that resulted in bug 1038282:

[10:43]	<aki>	Sylvestre: sw is shipping in 31 ?
[10:43]	<aki>	Pike: ^^
[10:44]	<Sylvestre>	aki, I haven't seen information about that :/
[10:45]	<aki>	Sylvestre: https://bugzilla.mozilla.org/show_bug.cgi?id=1019151 turned it off for 30; unclear whether it's ready to ship
[10:47]	<Sylvestre>	I guess it is the same as in 30
[10:47]	<aki>	"142 missing, 148 obsolete" seems bad, but i also see "1 error(s), 2701 missing, 74 obsolete" https://l10n.mozilla.org/shipping/about-milestone/fx31_beta_b9
[10:48]	<aki>	ok, i'll try without sw
[10:51]	<Pike>	yeah, not
[10:51]	<Pike>	aki: want a bug on that?
[10:51]	<aki>	Pike: i'm fine with irc. hsb is shipping?
[10:52]	<aki>	also, is there a way for relman to know this ahead of merge day?
[10:53]	<Pike>	just filed bug 1038282 for paper work either way
[10:54]	<aki>	ty
[10:54]	<Pike>	I think in general this should the "Final locale check with :Pike before we build RC candidate next week" last wednesday on the release calendar
[10:54]	<Pike>	that process didn't work out well, though


Keeping the "Get the list of l10n locales to remove from release management." line in https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Perform_mozilla-beta_-.3E_mozilla-release_migration
(Assignee)

Comment 4

3 years ago
Created attachment 8455498 [details] [diff] [review]
migration_script_release

Found some changes I needed to make in gecko_migration.py for the beta->release migration.  Should be a one-time patch.
Attachment #8455498 - Flags: review?(rail)
Attachment #8455498 - Flags: review?(rail) → review+
(Assignee)

Comment 5

3 years ago
Comment on attachment 8455498 [details] [diff] [review]
migration_script_release

http://hg.mozilla.org/build/mozharness/rev/c5509ad117fe
Attachment #8455498 - Flags: checked-in+
(Assignee)

Comment 6

3 years ago
Created attachment 8455532 [details] [diff] [review]
beta_tag_fix

Another one-time fix.
Basically, change the http://hg.mozilla.org/releases/mozilla-beta/rev/6befadcaa685 comment to only say "Tagging mozilla-beta ..." instead of "Tagging /src/.../mozilla-beta ..."
Attachment #8455532 - Flags: review?(rail)
Attachment #8455532 - Flags: review?(rail) → review+
(Assignee)

Comment 7

3 years ago
Comment on attachment 8455532 [details] [diff] [review]
beta_tag_fix

https://hg.mozilla.org/build/mozharness/rev/b95ae3e414a7
Attachment #8455532 - Flags: checked-in+
(Assignee)

Comment 8

3 years ago
Oops, https://bugzilla.mozilla.org/attachment.cgi?id=8458447&action=edit should have been in this bug.
(Assignee)

Comment 9

3 years ago
Created attachment 8458460 [details] [diff] [review]
disable-aurora

Not sure what I think of the build_localconfig.py bit.  In a way it was a pain to remember, and in a way this patch is a little ugly.
Attachment #8458460 - Flags: review?(rail)
(Assignee)

Comment 10

3 years ago
Created attachment 8458475 [details] [diff] [review]
new_vcs-sync_l10n

Per https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Update_l10n_vcs-sync .
Attachment #8458475 - Flags: review?(pmoore)
(Assignee)

Comment 11

3 years ago
Created attachment 8458511 [details] [diff] [review]
legacy_vcs-sync_l10n
Attachment #8458511 - Flags: review?(hwine)
Attachment #8458460 - Flags: review?(rail) → review+
Comment on attachment 8458475 [details] [diff] [review]
new_vcs-sync_l10n

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

r+ with comments removed (and if v2_1 does not yet need to be added)

::: configs/vcs_sync/l10n.py
@@ +89,2 @@
>                  # MERGE DAY switch to the below hg_url on 2014-07-21
>                  # 'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v2_0/%(locale)s',

The updated hg_url is fine, but the comments in lines 89 and 90 need to be removed.

I haven't yet checked the merge day docs - but I guess adding v2_1 comes later, and then we point v2_1 to https://hg.mozilla.org/gaia-l10n/%(locale)s - or does that need to be done at the same time as this change?
Attachment #8458475 - Flags: review?(pmoore) → review+
(Assignee)

Comment 13

3 years ago
(In reply to Pete Moore [:pete][:pmoore] from comment #12)
> ::: configs/vcs_sync/l10n.py
> @@ +89,2 @@
> >                  # MERGE DAY switch to the below hg_url on 2014-07-21
> >                  # 'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v2_0/%(locale)s',
> 
> The updated hg_url is fine, but the comments in lines 89 and 90 need to be
> removed.

Good catch.

> I haven't yet checked the merge day docs - but I guess adding v2_1 comes
> later, and then we point v2_1 to https://hg.mozilla.org/gaia-l10n/%(locale)s
> - or does that need to be done at the same time as this change?

2.1 is on master, so it's called 'master' til 6 weeks from now.  At that point gecko goes to mozilla-aurora and we create a v2_1 from gaia-l10n, and then 12 weeks from now we pull v2_1 from releases/gaia-l10n/v2_1, unless the process changes again.
Comment on attachment 8458511 [details] [diff] [review]
legacy_vcs-sync_l10n

lgtm, and applying the patch seems to be consistent:

= config diff =

== before applying ==

* number of l10n hgrc files
     r!ls *l10n*/hgrc | wc
     129     129    3977

== after applying ==

* number of l10n hgrc files
     r!ls *l10n*/hgrc | wc
     129     129    3977
* number of files in patch (2x # repos):
    r! grep -c ^diff /tmp/legacy_vcs-sync_l10n.txt
     148
* number of l10n config files with a renameremotev20defaultbranchto
  line:
     r! grep -l renameremotev20defaultbranchto *l10n*/config | wc
      74      74    2199
* number of l10n config files with v2_0 in remotes_to_pull
     r! grep remotes_to_pull *l10n*/hgrc | grep -cw v2_0
      74
Attachment #8458511 - Flags: review?(hwine) → review+
(Assignee)

Comment 15

3 years ago
Comment on attachment 8458475 [details] [diff] [review]
new_vcs-sync_l10n

https://hg.mozilla.org/build/mozharness/rev/fe63e782cbe2
Attachment #8458475 - Flags: checked-in+
(Assignee)

Comment 16

3 years ago
(In reply to Aki Sasaki [:aki] from comment #15)
> Comment on attachment 8458475 [details] [diff] [review]
> new_vcs-sync_l10n
> 
> https://hg.mozilla.org/build/mozharness/rev/fe63e782cbe2

New vcs-sync l10n isn't live yet, so not merging atm.  In later merge days the timing on this will be more important, but not critical until we start pulling l10n from git in our b2g builds.
(Assignee)

Comment 17

3 years ago
Comment on attachment 8458511 [details] [diff] [review]
legacy_vcs-sync_l10n

http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/cd17f7ccea8f
Attachment #8458511 - Flags: checked-in+
(Assignee)

Comment 18

3 years ago
bumped gecko versions in http://hg.mozilla.org/build/buildbot-configs/rev/ea1dd17b4a35
(Assignee)

Comment 19

3 years ago
Comment on attachment 8458460 [details] [diff] [review]
disable-aurora

http://hg.mozilla.org/build/buildbot-configs/rev/89792b3302cd
Attachment #8458460 - Flags: checked-in+
(Assignee)

Comment 20

3 years ago
In production.
(Assignee)

Comment 21

3 years ago
Created attachment 8459702 [details] [diff] [review]
pause_gecko_git_legacy
Attachment #8459702 - Flags: review?(hwine)
(Assignee)

Comment 22

3 years ago
Created attachment 8459704 [details] [diff] [review]
pause_new_vcs-sync

This isn't live yet, but it's good practice and may help avoid breaking pmoore's staging.
Attachment #8459704 - Flags: review?(rail)
Attachment #8459704 - Flags: review?(rail) → review+
Comment on attachment 8459702 [details] [diff] [review]
pause_gecko_git_legacy

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

lgtm
Attachment #8459702 - Flags: review?(hwine) → review+
(Assignee)

Comment 24

3 years ago
Comment on attachment 8459704 [details] [diff] [review]
pause_new_vcs-sync

http://hg.mozilla.org/build/mozharness/rev/dfcfae9a1bc6
Attachment #8459704 - Flags: checked-in+
(Assignee)

Comment 25

3 years ago
Comment on attachment 8459702 [details] [diff] [review]
pause_gecko_git_legacy

https://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-tools/rev/0a96492cc05b
Attachment #8459702 - Flags: checked-in+
(Assignee)

Comment 26

3 years ago
Created attachment 8459757 [details] [diff] [review]
fix_migration
Attachment #8459757 - Flags: review?(rail)
(Assignee)

Comment 27

3 years ago
Created attachment 8459758 [details] [diff] [review]
fix_migration

With less hardcode and more branches for release_to_esr
Attachment #8459757 - Attachment is obsolete: true
Attachment #8459757 - Flags: review?(rail)
Attachment #8459758 - Flags: review?(rail)
Comment on attachment 8459758 [details] [diff] [review]
fix_migration

maybe pull_by_revision() and make revision mandatory?
Attachment #8459758 - Flags: review?(rail) → review+
(Assignee)

Comment 29

3 years ago
Comment on attachment 8459758 [details] [diff] [review]
fix_migration

(In reply to Rail Aliiev [:rail] from comment #28)
> Comment on attachment 8459758 [details] [diff] [review]
> fix_migration
> 
> maybe pull_by_revision() and make revision mandatory?

Per IRC, making revision mandatory would break beta_to_release and release_to_esr.

http://hg.mozilla.org/build/mozharness/rev/09e438ee911a
Attachment #8459758 - Flags: checked-in+
(Assignee)

Comment 30

3 years ago
Created attachment 8459798 [details] [diff] [review]
get_merge_day_working

Needed to actually get the migration working from aurora->beta.
Attachment #8459798 - Flags: review?(rail)
Attachment #8459798 - Flags: review?(rail) → review+
(Assignee)

Comment 31

3 years ago
Comment on attachment 8459798 [details] [diff] [review]
get_merge_day_working

https://hg.mozilla.org/build/mozharness/rev/042ee7510b2f
Attachment #8459798 - Flags: checked-in+
(Assignee)

Comment 32

3 years ago
Landed gaia_l10n.sh in braindump for getting the gaia-l10n v2_0 repos in sync.
https://hg.mozilla.org/build/braindump/rev/2e7c16ba5c9c

I got "WARNING releases/gaia-l10n/v2_0/es is newer!" for https://hg.mozilla.org/releases/gaia-l10n/v2_0/es/rev/895d5487bc41 ; the comment says it's 2.0 specific so no worries there.

Updating docs...
(Assignee)

Comment 33

3 years ago
Created attachment 8459878 [details] [diff] [review]
enable_new_vcs-sync
Attachment #8459878 - Flags: review?(rail)
(Assignee)

Comment 34

3 years ago
Created attachment 8459879 [details] [diff] [review]
legacy_2.0_tools
Attachment #8459879 - Flags: review?(hwine)
(Assignee)

Comment 35

3 years ago
Created attachment 8459880 [details] [diff] [review]
legacy_2.0_configs
Attachment #8459880 - Flags: review?(hwine)
Comment on attachment 8459879 [details] [diff] [review]
legacy_2.0_tools

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

lgtm
Attachment #8459879 - Flags: review?(hwine) → review+
Comment on attachment 8459880 [details] [diff] [review]
legacy_2.0_configs

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

lgtm
Attachment #8459880 - Flags: review?(hwine) → review+
Attachment #8459878 - Flags: review?(rail) → review+
(Assignee)

Comment 38

3 years ago
Comment on attachment 8459879 [details] [diff] [review]
legacy_2.0_tools

https://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-tools/rev/930bbbe21271
Attachment #8459879 - Flags: checked-in+
(Assignee)

Comment 39

3 years ago
Comment on attachment 8459880 [details] [diff] [review]
legacy_2.0_configs

https://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/9f59333750d9
Attachment #8459880 - Flags: checked-in+
(Assignee)

Comment 40

3 years ago
Comment on attachment 8459878 [details] [diff] [review]
enable_new_vcs-sync

https://hg.mozilla.org/build/mozharness/rev/84b3c50018f7
Attachment #8459878 - Flags: checked-in+
(Assignee)

Comment 41

3 years ago
Followup fix to legacy keep_updated:
https://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-tools/rev/a96a1d31e6ea
woot http://git.mozilla.org/?p=releases/gecko.git;a=shortlog;h=refs/heads/v2.0
(Assignee)

Updated

3 years ago
Status: NEW → RESOLVED
Last Resolved: 3 years ago
Resolution: --- → FIXED
We used to have RELEASE_BASE_* after merge day but we don't have RELEASE_BASE_20140721.
Is that expected? Thanks
(Assignee)

Comment 43

3 years ago
Yes, the naming has changed to match aurora and beta. https://hg.mozilla.org/releases/mozilla-beta/rev/1772e55568e4 FIREFOX_RELEASE_31_BASE
(Assignee)

Comment 44

3 years ago
Oops, forgot to land: http://hg.mozilla.org/build/mozharness/rev/c9c14b7f685b
You need to log in before you can comment on or make changes to this bug.