962187 - Tracking bug for 17-mar-2014 migration work

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Aki Sasaki (not active)]

The B2G cadence may have changed by this point; verify with :bajaj and :preeti that we still want to follow https://wiki.mozilla.org/ReleaseEngineering:MergeDuty#Aurora_is_an_even_numbered_Gecko_version .

Comment 1

[Aki Sasaki (not active)]

(Assigning to :rail, unless we decide to split the release + merge duty work)

Comment 2

[Rail Aliiev [:rail]]

Attachment: [configs] beta -> release

This should be landed next week after the beta -> release uplift.

Comment 3

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

Comment on attachment 8385411 [details] [diff] [review]
[configs] beta -> release

Suspiciously simple ;-)

Comment 4

[Rail Aliiev [:rail]]

Comment on attachment 8385411 [details] [diff] [review]
[configs] beta -> release

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

Comment 5

[Rail Aliiev [:rail]]

in production

Comment 6

[Rail Aliiev [:rail]]

Attachment: tb_cleanup-buildbot-configs.diff

kill dead code

Comment 7

[Rail Aliiev [:rail]]

Comment on attachment 8389833 [details] [diff] [review]
tb_cleanup-buildbot-configs.diff

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

Comment 8

[Rail Aliiev [:rail]]

Attachment: b2g30_m-a-buildbot-configs.diff

add mozilla-aurora

Comment 9

[Rail Aliiev [:rail]]

Attachment: bump-gecko-version-firefox-buildbot-configs.diff

Comment 10

[John Hopkins (:jhopkins)]

tb_cleanup-buildbot-configs.diff is in production

Comment 11

[Rail Aliiev [:rail]]

Attachment: b2g30_m-a-buildbot-configs-1.diff

refreshed, conflicts resolved

Comment 12

[Rail Aliiev [:rail]]

Comment on attachment 8390156 [details] [diff] [review]
b2g30_m-a-buildbot-configs-1.diff

I'll need to update this because we are not killing b2g18 yet

Comment 13

[Hal Wine [:hwine] use NI!]

Comment on attachment 8389989 [details] [diff] [review]
bump-gecko-version-firefox-buildbot-configs.diff

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

lgtm, but also needs to be done in mozilla-tests/master_common.py. r- for that

Comment 14

[Rail Aliiev [:rail]]

Comment on attachment 8389989 [details] [diff] [review]
bump-gecko-version-firefox-buildbot-configs.diff

Take 2, the same patch, because:

ls -l mozilla-tests/master_common.py
lrwxrwxrwx 1 rail rail 27 Mar 12 11:05 mozilla-tests/master_common.py -> ../mozilla/master_common.py

;)

Comment 15

[Hal Wine [:hwine] use NI!]

Comment on attachment 8389989 [details] [diff] [review]
bump-gecko-version-firefox-buildbot-configs.diff

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

well, bother! got fooled my mxr. looks GREAT to me

Comment 16

[Rail Aliiev [:rail]]

Attachment: merge-day-buildbot-configs-1.diff

Almost zero changes due to the merge day:

* fixed some comments to reflect the reality
* added mozilla-aurora

Comment 17

[Rail Aliiev [:rail]]

Attachment: merge-day-buildbot-configs-2.diff

* https://hg.mozilla.org/gaia-l10n is used per https://bugzilla.mozilla.org/show_bug.cgi?id=982921#c3

Comment 18

[Rail Aliiev [:rail]]

Attachment: legacy_vcs_sync.diff

Comment 19

[Rail Aliiev [:rail]]

Attachment: modern_vcs_sync.diff

Comment 20

[Hal Wine [:hwine] use NI!]

Comment on attachment 8390526 [details] [diff] [review]
merge-day-buildbot-configs-2.diff

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

surprised that there weren't changes for wasabi, emulator-jb, nexus-4, hamachi, but those appear to have been "left on" at last merge.
lgtm

Comment 21

[Hal Wine [:hwine] use NI!]

Comment on attachment 8390538 [details] [diff] [review]
legacy_vcs_sync.diff

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

lgtm - again aurora was "left on" last time -- not sure that was correct.

Comment 22

[Hal Wine [:hwine] use NI!]

Comment on attachment 8390545 [details] [diff] [review]
modern_vcs_sync.diff

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

lgtm

Comment 23

[Rail Aliiev [:rail]]

(In reply to Hal Wine [:hwine] (use needinfo) from comment #21)
> lgtm - again aurora was "left on" last time -- not sure that was correct.

It was harmless, I think it's not a bad idea to leave it there -- less chances to forget about aurora.

Comment 24

[Rail Aliiev [:rail]]

Attachment: b2g-manifests-v1.4.diff

This patch may be not final. I'm going to repeat the same procedure on Monday to make sure they are identical.

* manually unbumped platform_build in peak.xml and keon.xml (bug 971741)
* manully bumped gecko/gaia

The log incoming.

Comment 25

[Rail Aliiev [:rail]]

Attachment: b2g_branch_repos.py log

Comment 26

[Hal Wine [:hwine] use NI!]

Comment on attachment 8390616 [details] [diff] [review]
b2g-manifests-v1.4.diff

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

lgtm -- left notes where I spotted special branching needed for 1.4 branch

::: base-jb.xml
@@ -75,5 @@
>    <project name="platform/external/liblzf" path="external/liblzf"/>
>    <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp"/>
>    <project name="platform/external/libnl-headers" path="external/libnl-headers"/>
>    <project name="platform/external/libogg" path="external/libogg"/>
> -  <project name="platform_external_libpng" path="external/libpng" remote="b2g" revision="b2g-4.3_r2.1"/>

Note: during branching, this will need to be branched from this tag, not master.

::: base-kk.xml
@@ -17,5 @@
> -  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="master"/>
> -  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="master"/>
> -  <project name="moztt" path="external/moztt" remote="b2g" revision="master"/>
> -  <project name="rilproxy" path="rilproxy" remote="b2g" revision="master"/>
> -  <project name="valgrind" path="external/valgrind" remote="b2g" revision="fxos"/>

NOTE: valgrind needs to be branched at tag 'fxos'

@@ -123,5 @@
>    <project name="platform/system/security" path="system/security"/>
>    <project name="platform/system/vold" path="system/vold"/>
>  
> -  <project name="platform_frameworks_av" path="frameworks/av" remote="b2g" revision="b2g-4.4.2_r1"/>
> -  <project name="platform_system_core" path="system/core" remote="b2g" revision="b2g-4.4.2_r1"/>

NOTE: these repos need to be branched at the tags mentioned.

::: emulator.xml
@@ -110,5 @@
>    <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="aosp-new/master" />
>    <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="aosp-new/master" />
>    <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="aosp-new/master" />
> -  <project path="prebuilts/qemu-kernel" name="platform_prebuilts_qemu-kernel" remote="b2g" revision="master" />
> -  <project path="sdk" name="android-sdk" remote="b2g" revision="emu-fix" />

NOTE: sdk needs to be branched at revision 'emu-fix'

::: nexus-s-4g.xml
@@ -101,5 @@
>    <project path="system/vold" name="platform/system/vold" />
>  
>    <!-- Nexus S 4G specific things -->
> -  <project path="device/samsung/crespo" name="android-device-crespo" remote="b2g" revision="master" />
> -  <project path="device/samsung/crespo4g" name="android-device-crespo4g" remote="b2g" revision="ics-b2g" />

NOTE: android-device-crespo4g will need to be branched at tag "ics-b2g"

Comment 27

[Rail Aliiev [:rail]]

(In reply to Hal Wine [:hwine] (use needinfo) from comment #26)
> lgtm -- left notes where I spotted special branching needed for 1.4 branch
> > -  <project name="platform_external_libpng" path="external/libpng" remote="b2g" revision="b2g-4.3_r2.1"/>
> 
> Note: during branching, this will need to be branched from this tag, not
> master.


I double checked, the script takes care of proper branching points.

Comment 28

[Rail Aliiev [:rail]]

Comment on attachment 8390526 [details] [diff] [review]
merge-day-buildbot-configs-2.diff

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

Comment 29

[Rail Aliiev [:rail]]

Comment on attachment 8389989 [details] [diff] [review]
bump-gecko-version-firefox-buildbot-configs.diff

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

Comment 30

[Hal Wine [:hwine] use NI!]

Attachment: l10n-conversions.diff

stop l10n conversions

Comment 31

[Hal Wine [:hwine] use NI!]

Comment on attachment 8392327 [details] [diff] [review]
l10n-conversions.diff

http://hg.mozilla.org/build/mozharness/rev/9f0597938f6a

And merged:
  https://hg.mozilla.org/build/mozharness/rev/91ce42b2f39e

Comment 32

[Aki Sasaki (not active)]

Attachment: mh-mergeday

Comment 33

[Aki Sasaki (not active)]

Attachment: mh-b2gbumper

Comment 34

[Aki Sasaki (not active)]

Attachment: puppet-b2gbumper

Comment 35

[Aki Sasaki (not active)]

Attachment: mh-b2gbumper

Comment 36

[Aki Sasaki (not active)]

Comment on attachment 8392368 [details] [diff] [review]
mh-b2gbumper

http://hg.mozilla.org/build/mozharness/rev/06bb95a16c55

Comment 37

[Aki Sasaki (not active)]

Comment on attachment 8392361 [details] [diff] [review]
puppet-b2gbumper

http://hg.mozilla.org/build/puppet/rev/6bf23a4e9124

Comment 38

[Aki Sasaki (not active)]

Comment on attachment 8392358 [details] [diff] [review]
mh-mergeday

http://hg.mozilla.org/build/mozharness/rev/eccdc5c3a608

Comment 39

[Rail Aliiev [:rail]]

Comment on attachment 8390616 [details] [diff] [review]
b2g-manifests-v1.4.diff

https://github.com/mozilla-b2g/b2g-manifest/commit/de5b44093f4afd09c9794b0ba512fdd97c6c2a1f

Comment 40

[Rail Aliiev [:rail]]

Attachment: m-c-b2g-version-bump.diff

Comment 41

[Rail Aliiev [:rail]]

Attachment: mozilla-aurora b2g configs

Comment 42

[Rail Aliiev [:rail]]

Comment on attachment 8392512 [details] [diff] [review]
m-c-b2g-version-bump.diff

https://hg.mozilla.org/mozilla-central/rev/5d61fabc49a8

Comment 43

[Rail Aliiev [:rail]]

Comment on attachment 8390545 [details] [diff] [review]
modern_vcs_sync.diff

remote:   https://hg.mozilla.org/build/mozharness/rev/e5b15f5285f0
remote:   https://hg.mozilla.org/build/mozharness/rev/11cce5900fcf

Comment 44

[Rail Aliiev [:rail]]

Comment on attachment 8390538 [details] [diff] [review]
legacy_vcs_sync.diff

http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-tools/rev/6289fd7f03e9

Comment 45

[Rail Aliiev [:rail]]

Comment on attachment 8392536 [details] [diff] [review]
mozilla-aurora b2g configs

https://hg.mozilla.org/releases/mozilla-aurora/rev/3776f72f1967

Comment 46

[Hal Wine [:hwine] use NI!]

Attachment: restart_l10n.diff

backout of attachment 8392327 [details] [diff] [review] to restart l10n

Comment 47

[Hal Wine [:hwine] use NI!]

Attachment: restart_l10n.diff

Line up the gecko l10n repos

Comment 48

[Hal Wine [:hwine] use NI!]

Attachment: restart_l10n.diff

3rd time's a charm. Honest.

Comment 49

[Hal Wine [:hwine] use NI!]

Comment on attachment 8392590 [details] [diff] [review]
restart_l10n.diff

http://hg.mozilla.org/build/mozharness/rev/8dc1f22af717

And in production:
  http://hg.mozilla.org/build/mozharness/rev/a32bd0014747

Comment 50

[Chris AtLee [:catlee]]

Enabled mozilla-aurora in ACTIVE_B2G_BRANCHES https://hg.mozilla.org/build/buildbot-configs/rev/f6300682caa2

Comment 51

[Axel Hecht [:Pike]]

Reading through https://tbpl.mozilla.org/?tree=Mozilla-Aurora&rev=3776f72f1967, I think that's building aurora against integration/gaia-central?

Also, https://hg.mozilla.org/integration/gaia-1_4/ doesn't have a single changeset yet, not sure if that's a bug or a feature?

Comment 52

[Hal Wine [:hwine] use NI!]

(In reply to Axel Hecht [:Pike][pto til 14th] from comment #51)
> Also, https://hg.mozilla.org/integration/gaia-1_4/ doesn't have a single
> changeset yet, not sure if that's a bug or a feature?

bug - on that -- added to today's list

Comment 53

[Armen [:armenzg]]

Live in production.

Comment 54

[Rail Aliiev [:rail]]

Attachment: gaia.diff

Comment 55

[Hal Wine [:hwine] use NI!]

Attachment: v1.4.diff

As deployed, from script output
 http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/edaa2bf2259c

Comment 56

[Rail Aliiev [:rail]]

Fennec Aurora updates has been enabled today. All done here.