1061861 - Tracking bug for 13-oct-2014 migration work

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Rail Aliiev [:rail]]

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

Comment 1

[Rail Aliiev [:rail]]

Attachment: merge-release-buildbot-configs.diff

Bump mozilla-release version for the release merge day.

Comment 2

[Pete Moore [:pmoore][:pete]]

In production

Comment 3

[Rail Aliiev [:rail]]

Comment on attachment 8498221 [details] [diff] [review]
merge-release-buildbot-configs.diff

http://hg.mozilla.org/build/buildbot-configs/rev/6119b9881c88

Comment 4

[Rail Aliiev [:rail]]

Attachment: pause-gecko.git-legacy.diff

Comment 5

[Rail Aliiev [:rail]]

Attachment: pause-gecko.git-modern.diff

Comment 6

[Rail Aliiev [:rail]]

Attachment: restart-gecko.git-legacy.diff

Comment 7

[Rail Aliiev [:rail]]

Attachment: restart-gecko.git-modern.diff

Comment 8

[Rail Aliiev [:rail]]

Attachment: pause-gecko.l10n-modern.diff

Comment 9

[Rail Aliiev [:rail]]

Attachment: restart-gecko.l10n-modern.diff

Comment 10

[Rail Aliiev [:rail]]

Attachment: gaia_l10n_legacy.diff

Comment 11

[Rail Aliiev [:rail]]

Comment on attachment 8500500 [details] [diff] [review]
pause-gecko.git-legacy.diff

Following https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Central_will_become_an_even_numbered_Gecko_version#Merge_Day

Comment 12

[Rail Aliiev [:rail]]

Attachment: bumper-switch-to-b2g34.diff

Comment 13

[hwine]

Comment on attachment 8500500 [details] [diff] [review]
pause-gecko.git-legacy.diff

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

okay as is, but would be "safer" if 'aurora' is removed from for loop.

Comment 14

[hwine]

Comment on attachment 8500502 [details] [diff] [review]
restart-gecko.git-legacy.diff

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

::: keep_updated
@@ +19,5 @@
>  v13t_branch=b2g28_v1_3t
>  v14_branch=b2g30_v1_4
>  v20_branch=b2g32_v2_0
>  v20m_branch=b2g32_v2_0m
> +v21_branch=b2g34_v2_1

the hg repo needs to be added to the for loop

Comment 15

[Rail Aliiev [:rail]]

Attachment: pause-gecko.git-legacy.diff

removed aurora from the loop

Comment 16

[Rail Aliiev [:rail]]

Attachment: restart-gecko.git-legacy.diff

Comment 17

[hwine]

Comment on attachment 8500603 [details] [diff] [review]
gaia_l10n_legacy.diff

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

glad this was scripted, r-
 - 2 locales are new this time, and need the sections added as well -- br & pt-PT
 - the 'remotes_to_pull' value needs to be replaced (not just a new line added)

fwiw, I spotted an issue quickly using the following greps:
 - grep -c ^diff # total # files, must be even (150)
 - egrep -c '^diff.*hgrc$' # = #hgrc 1/2 of total (75)
 - egrep -c '^diff.*config$' # = #config 1/2 (75)
 - grep -c '^+v2_1' # paths added - s/b 1/2 of #hgrc (73)
 - grep -c '^+remotes_to_pull' - s/b 1/2 of #hgrc (73)
 - grep -c '^-remotes_to_pull' - s/b #hgrc - #new locales (0)
 - egrep -c '^\+\s+renameremote' # git renames - s/b #config (75)

I used vim to find the new locales, but the following gives a more direct pointer:
 $ egrep '^(diff.*hgrc)|(\+v2_1)' gaia_l10n_legacy.diff | awk 'last == $1 {print "new locale before " $0} {last=$1}'
new locale before diff --git a/releases-l10n-bs-gaia/hgrc b/releases-l10n-bs-gaia/hgrc
new locale before diff --git a/releases-l10n-ro-gaia/hgrc b/releases-l10n-ro-gaia/hgrc

::: releases-l10n-br-gaia/config
@@ +6,5 @@
>  	url = git+ssh://git.m.o/releases/l10n/br/gaia.git
>  	mirror = true
>  [gc]
>  	auto = 0
> +	renameremotev21defaultbranchto = v2.1

first time locale included -- needs section header

::: releases-l10n-br-gaia/hgrc
@@ +3,5 @@
>  [extensions]
>  hggit=
>  [git]
>  intree=1
> +

first time locale included -- needs path & added section header

::: releases-l10n-pt-PT-gaia/config
@@ +6,5 @@
>  	url = git+ssh://git.m.o/releases/l10n/pt-PT/gaia.git
>  	mirror = true
>  [gc]
>  	auto = 0
> +	renameremotev21defaultbranchto = v2.1

first time locale added - see above

::: releases-l10n-pt-PT-gaia/hgrc
@@ +3,5 @@
>  [extensions]
>  hggit=
>  [git]
>  intree=1
> +

first time locale added - see above

Comment 18

[Rail Aliiev [:rail]]

Attachment: gaia_l10n_legacy.diff

Thanks for catching the new locales issue. I also found another one (multiple remotes_to_pull lines) and fixed in this patch.

Comment 19

[hwine]

Comment on attachment 8501233 [details] [diff] [review]
gaia_l10n_legacy.diff

yay! lgtm

Comment 20

[Rail Aliiev [:rail]]

Attachment: bumper-switch-to-b2g34.diff

Ooops. Forgot to change gecko_local_dir

Comment 21

[Rail Aliiev [:rail]]

Attachment: b2g34-builds-mozharness.diff

Per https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Update_mozharness_for_b2gXX

Comment 22

[Rail Aliiev [:rail]]

Attachment: b2g34-bump-and-kill-aurora-buildbot-configs.diff

Comment 23

[hwine]

Comment on attachment 8501733 [details] [diff] [review]
bumper-switch-to-b2g34.diff

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

oops - thanks for catching that; r+

Comment 24

[hwine]

Comment on attachment 8501734 [details] [diff] [review]
b2g34-builds-mozharness.diff

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

got all files/instances

Comment 25

[hwine]

Comment on attachment 8501874 [details] [diff] [review]
b2g34-bump-and-kill-aurora-buildbot-configs.diff

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

one question on dolphin builds - as long as that answered, lgtm

::: mozilla/b2g_config.py
@@ -1645,5 @@
> -BRANCHES['mozilla-aurora']['platforms']['emulator-kk']['enable_nightly'] = True
> -BRANCHES['mozilla-aurora']['platforms']['emulator-kk-debug']['enable_nightly'] = True
> -BRANCHES['mozilla-aurora']['platforms']['dolphin']['enable_nightly'] = True
> -BRANCHES['mozilla-aurora']['platforms']['dolphin_eng']['enable_nightly'] = True
> -

mozilla-aurora is also specified for dolphin builds around line 1815 -- does that need to change?

Comment 26

[Rail Aliiev [:rail]]

(In reply to Hal Wine [:hwine] (use needinfo) from comment #25)
 > mozilla-aurora is also specified for dolphin builds around line 1815 -- does
> that need to change?

I didn't touch that part just in case we decide to continue using our automation.

Comment 27

[Rail Aliiev [:rail]]

Attachment: gaia_l10n_modern.diff

Looks like I forgot about this one :/
https://wiki.mozilla.org/ReleaseEngineering/Merge_Duty/Steps#Update_Gaia_l10n_vcs-sync

Comment 28

[Rail Aliiev [:rail]]

Comment on attachment 8501233 [details] [diff] [review]
gaia_l10n_legacy.diff

http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/be16cf206109
deployed

Comment 29

[Pete Moore [:pmoore][:pete]]

Comment on attachment 8504051 [details] [diff] [review]
gaia_l10n_modern.diff

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

Looks good to me.

Comment 30

[Rail Aliiev [:rail]]

Comment on attachment 8504051 [details] [diff] [review]
gaia_l10n_modern.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/a1c04862f3c2
remote:   https://hg.mozilla.org/build/mozharness/rev/33b23daad037

Comment 31

[Rail Aliiev [:rail]]

Comment on attachment 8501874 [details] [diff] [review]
b2g34-bump-and-kill-aurora-buildbot-configs.diff

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

Comment 32

[Rail Aliiev [:rail]]

Comment on attachment 8500510 [details] [diff] [review]
pause-gecko.l10n-modern.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/b1dd421e91fa
remote:   https://hg.mozilla.org/build/mozharness/rev/600016362054

Comment 33

[Rail Aliiev [:rail]]

Comment on attachment 8500501 [details] [diff] [review]
pause-gecko.git-modern.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/c03eff4ed4a3
remote:   https://hg.mozilla.org/build/mozharness/rev/a534d978a6aa

Comment 34

[Rail Aliiev [:rail]]

Comment on attachment 8500745 [details] [diff] [review]
pause-gecko.git-legacy.diff

http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-tools/rev/16b79c89a4b5
deployed

Comment 35

[Rail Aliiev [:rail]]

Comment on attachment 8500503 [details] [diff] [review]
restart-gecko.git-modern.diff

https://hg.mozilla.org/build/mozharness/rev/98214f26c584

Comment 36

[Rail Aliiev [:rail]]

Comment on attachment 8500511 [details] [diff] [review]
restart-gecko.l10n-modern.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/a9eb0885103a
remote:   https://hg.mozilla.org/build/mozharness/rev/552b1ced90d0

Comment 37

[Rail Aliiev [:rail]]

Comment on attachment 8500750 [details] [diff] [review]
restart-gecko.git-legacy.diff

http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-tools/rev/2822c6122a6d

Comment 38

[Rail Aliiev [:rail]]

Comment on attachment 8501733 [details] [diff] [review]
bumper-switch-to-b2g34.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/2a27b76c430d
remote:   https://hg.mozilla.org/build/mozharness/rev/786d1a964ca5

Comment 39

[Rail Aliiev [:rail]]

Comment on attachment 8501734 [details] [diff] [review]
b2g34-builds-mozharness.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/7463a9c4d7af
remote:   https://hg.mozilla.org/build/mozharness/rev/17b35c98c372

Comment 40

[Pete Moore [:pmoore][:pete]]

Checked in code landed in production

Comment 41

[Rail Aliiev [:rail]]

All done here. The docs have been updated as well.