Closed Bug 962187 Opened 6 years ago Closed 6 years ago

Tracking bug for 17-mar-2014 migration work

Categories

(Release Engineering :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: aki, Assigned: rail)

References

Details

Attachments

(16 files, 7 obsolete files)

889 bytes, patch
nthomas
: review+
Details | Diff | Splinter Review
1.73 KB, patch
jhopkins
: review+
Details | Diff | Splinter Review
1.26 KB, patch
hwine
: review+
Details | Diff | Splinter Review
11.26 KB, patch
hwine
: review+
Details | Diff | Splinter Review
2.46 KB, patch
hwine
: review+
Details | Diff | Splinter Review
1.42 KB, patch
hwine
: review+
Details | Diff | Splinter Review
135.71 KB, patch
hwine
: review+
Details | Diff | Splinter Review
15.73 KB, text/plain
Details
879 bytes, patch
rail
: review+
hwine
: checked-in+
Details | Diff | Splinter Review
5.40 KB, patch
rail
: review+
Details | Diff | Splinter Review
872 bytes, patch
catlee
: review+
Details | Diff | Splinter Review
1.86 KB, patch
catlee
: review+
Details | Diff | Splinter Review
537 bytes, patch
aki
: review+
Details | Diff | Splinter Review
9.72 KB, patch
aki
: review+
Details | Diff | Splinter Review
917 bytes, patch
aki
: review+
hwine
: checked-in+
Details | Diff | Splinter Review
1.44 KB, patch
hwine
: checked-in+
Details | Diff | Splinter Review
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 .
Depends on: 875164
Assignee: nobody → rail
(Assigning to :rail, unless we decide to split the release + merge duty work)
Depends on: 966578
Depends on: 969095
Depends on: 976691
This should be landed next week after the beta -> release uplift.
Attachment #8385411 - Flags: review?(nthomas)
Blocks: 961831
Depends on: 979652
No longer depends on: 979652
Comment on attachment 8385411 [details] [diff] [review]
[configs] beta -> release

Suspiciously simple ;-)
Attachment #8385411 - Flags: review?(nthomas) → review+
in production
kill dead code
Attachment #8389833 - Flags: review?(jhopkins)
Attachment #8389833 - Flags: review?(jhopkins) → review+
Attached patch b2g30_m-a-buildbot-configs.diff (obsolete) — Splinter Review
add mozilla-aurora
Attachment #8389988 - Flags: review?(hwine)
tb_cleanup-buildbot-configs.diff is in production
refreshed, conflicts resolved
Attachment #8389988 - Attachment is obsolete: true
Attachment #8389988 - Flags: review?(hwine)
Attachment #8390156 - Flags: review?(hwine)
No longer depends on: 875164
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
Attachment #8390156 - Flags: review?(hwine)
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
Attachment #8389989 - Flags: review?(hwine) → review-
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

;)
Attachment #8389989 - Flags: review- → review?(hwine)
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
Attachment #8389989 - Flags: review?(hwine) → review+
Almost zero changes due to the merge day:

* fixed some comments to reflect the reality
* added mozilla-aurora
Attachment #8390156 - Attachment is obsolete: true
Attachment #8390523 - Flags: review?(hwine)
Attachment #8390538 - Flags: review?(hwine)
Attachment #8390545 - Flags: review?(hwine)
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
Attachment #8390526 - Flags: review?(hwine) → review+
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.
Attachment #8390538 - Flags: review?(hwine) → review+
Comment on attachment 8390545 [details] [diff] [review]
modern_vcs_sync.diff

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

lgtm
Attachment #8390545 - Flags: review?(hwine) → review+
(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.
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.
Attachment #8390616 - Flags: review?(hwine)
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"
Attachment #8390616 - Flags: review?(hwine) → review+
(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 on attachment 8389989 [details] [diff] [review]
bump-gecko-version-firefox-buildbot-configs.diff

https://hg.mozilla.org/build/buildbot-configs/rev/bdde3cc32dd8
Attachment #8389989 - Flags: checked-in+
stop l10n conversions
Attachment #8392327 - Flags: review?(aki)
Attachment #8392327 - Flags: review?(aki) → review+
Attached patch mh-mergedaySplinter Review
Attachment #8392358 - Flags: review?(rail)
Attached patch mh-b2gbumper (obsolete) — Splinter Review
Attachment #8392359 - Flags: review?(catlee)
Attached patch puppet-b2gbumperSplinter Review
Attachment #8392361 - Flags: review?(catlee)
Attachment #8392361 - Flags: review?(catlee) → review+
Attached patch mh-b2gbumperSplinter Review
Attachment #8392359 - Attachment is obsolete: true
Attachment #8392359 - Flags: review?(catlee)
Attachment #8392368 - Flags: review?(catlee)
Attachment #8392368 - Flags: review?(catlee) → review+
Attachment #8392358 - Flags: review?(rail) → review+
Attachment #8392512 - Flags: review?(aki)
Attachment #8392512 - Flags: review?(aki) → review+
Attachment #8392536 - Flags: review?(aki)
Attachment #8392536 - Flags: review?(aki) → review+
Attached patch restart_l10n.diff (obsolete) — Splinter Review
backout of attachment 8392327 [details] [diff] [review] to restart l10n
Attachment #8392576 - Flags: review?(rail)
Attached patch restart_l10n.diff (obsolete) — Splinter Review
Line up the gecko l10n repos
Attachment #8392576 - Attachment is obsolete: true
Attachment #8392576 - Flags: review?(rail)
Attachment #8392579 - Flags: review?(aki)
3rd time's a charm. Honest.
Attachment #8392579 - Attachment is obsolete: true
Attachment #8392579 - Flags: review?(aki)
Attachment #8392590 - Flags: review?(aki)
Attachment #8392590 - Flags: review?(aki) → review+
Enabled mozilla-aurora in ACTIVE_B2G_BRANCHES https://hg.mozilla.org/build/buildbot-configs/rev/f6300682caa2
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?
(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
Live in production.
Attached patch gaia.diff (obsolete) — Splinter Review
Attachment #8392958 - Flags: review?(hwine)
Attached patch v1.4.diffSplinter Review
As deployed, from script output
 http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/edaa2bf2259c
Attachment #8392958 - Attachment is obsolete: true
Attachment #8392958 - Flags: review?(hwine)
Attachment #8393033 - Flags: checked-in+
Depends on: 986648
Fennec Aurora updates has been enabled today. All done here.
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Component: General Automation → General
You need to log in before you can comment on or make changes to this bug.