Closed Bug 1116781 Opened 5 years ago Closed 5 years ago

Tracking bug for 12-Jan-2015 migration work

Categories

(Release Engineering :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: rail, Assigned: rail)

References

Details

Attachments

(20 files, 7 obsolete files)

36.00 KB, patch
bhearsum
: review+
Details | Diff | Splinter Review
17.19 KB, patch
bhearsum
: review+
Details | Diff | Splinter Review
2.89 KB, patch
gps
: review+
Details | Diff | Splinter Review
885 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
774 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
1.33 KB, patch
hwine
: review+
Details | Diff | Splinter Review
10.50 KB, patch
hwine
: review+
Details | Diff | Splinter Review
10.64 KB, patch
hwine
: review+
Details | Diff | Splinter Review
537 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
1.54 KB, patch
hwine
: review+
Details | Diff | Splinter Review
1.29 KB, patch
hwine
: review+
Details | Diff | Splinter Review
3.04 KB, patch
hwine
: review+
Details | Diff | Splinter Review
335 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
366 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
750 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
4.66 KB, patch
hwine
: review+
Details | Diff | Splinter Review
17.57 KB, patch
rail
: review+
Details | Diff | Splinter Review
772 bytes, patch
hwine
: review+
Details | Diff | Splinter Review
2.90 KB, patch
nthomas
: review+
Details | Diff | Splinter Review
692 bytes, patch
pmoore
: review+
pmoore
: checked-in+
Details | Diff | Splinter Review
+++ This bug was initially created as a clone of Bug #1097666 +++

B2G will be branched too this time. No need to ride it through aurora.
Depends on: 1116783
It also removes 34.1 hacks.
Attachment #8542991 - Flags: review?(bhearsum)
Depends on: 1116809
Attachment #8543022 - Flags: review?(gps) → review+
Attachment #8543046 - Flags: review?(hwine)
Attached patch v2.2-buildbot-configs.diff (obsolete) — Splinter Review
Attachment #8543048 - Flags: review?(hwine)
Attachment #8543054 - Flags: review?(hwine)
Comment on attachment 8542991 [details] [diff] [review]
merge-release-buildbot-configs-1.diff

Adding Nick in case he's around on Monday and has not too many emails to process. :)
Attachment #8542991 - Flags: review?(nthomas)
Attachment #8542992 - Flags: review?(nthomas)
The L10N story is not decided yet. Pointing the gecko part to aurora for now and leaving gaia as is.
Attachment #8543282 - Flags: review?(hwine)
Attached patch m-c-b2g-3.0.diffSplinter Review
Assuming our next B2G version in the mozilla-central tree will be 3.0
Attachment #8543283 - Flags: review?(bbajaj)
Attached patch v2.2-buildbot-configs.diff (obsolete) — Splinter Review
Fixed l10n paths
Attachment #8543048 - Attachment is obsolete: true
Attachment #8543048 - Flags: review?(hwine)
Attachment #8543285 - Flags: review?(hwine)
Comment on attachment 8542992 [details] [diff] [review]
merge-release-tools-1.diff

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

::: buildbot-helpers/release_sanity.py
@@ +474,5 @@
>  
>                  # verify that l10n changesets match the shipped locales
>                  if releaseConfig.get('shippedLocalesPath'):
>                      sr = releaseConfig['sourceRepositories'][source_repo]
> +                    sourceRepoPath = sr.get('clonePath', sr['path'])

This one should stay - it's fixing a legitimate bug in release sanity. r=me with this removed.
Attachment #8542992 - Flags: review?(bhearsum) → review+
Attachment #8542991 - Flags: review?(bhearsum) → review+
Comment on attachment 8542991 [details] [diff] [review]
merge-release-buildbot-configs-1.diff

https://hg.mozilla.org/build/buildbot-configs/rev/f5e4917aae84
Attachment #8542991 - Flags: review?(nthomas) → checked-in+
Comment on attachment 8542992 [details] [diff] [review]
merge-release-tools-1.diff

https://hg.mozilla.org/build/tools/rev/4a2cca222907
Attachment #8542992 - Flags: review?(nthomas) → checked-in+
Depends on: 1117241
Comment on attachment 8543283 [details] [diff] [review]
m-c-b2g-3.0.diff

bajaj is on PTO this week
Attachment #8543283 - Flags: review?(bbajaj) → review?(hwine)
Attached patch v2.2-buildbot-configs-1.diff (obsolete) — Splinter Review
Updated l10n paths
Attachment #8543285 - Attachment is obsolete: true
Attachment #8543285 - Flags: review?(hwine)
Attachment #8545257 - Flags: review?(hwine)
Attachment #8543046 - Flags: review?(hwine) → review+
Attachment #8543047 - Flags: review?(hwine) → review+
Attached patch gaia-legacy.diffSplinter Review
I can probably change fetch to use master:master to initialize the repo.
Attachment #8545338 - Flags: review?(hwine)
Attached patch gecko_legacy.diff (obsolete) — Splinter Review
Attachment #8545344 - Flags: review?(hwine)
Attached patch gecko_new.diffSplinter Review
Attachment #8545347 - Flags: review?(hwine)
Attached patch gecko_l10n_new.diff (obsolete) — Splinter Review
Attachment #8545352 - Flags: review?(hwine)
Attachment #8545352 - Attachment is obsolete: true
Attachment #8545352 - Flags: review?(hwine)
Attachment #8545356 - Flags: review?(hwine)
Attached patch gaia_l10n_new.diff (obsolete) — Splinter Review
Attachment #8545359 - Flags: review?(hwine)
should be landed at the same time as attachment 8545344 [details] [diff] [review]
Attachment #8545364 - Flags: review?(hwine)
Comment on attachment 8545257 [details] [diff] [review]
v2.2-buildbot-configs-1.diff

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

r- for non-updated key in mozilla/b2g_config.py, if removal of dophin_eng is correct, go for commit with key corrected

::: mozilla/b2g_config.py
@@ +1728,5 @@
> +# This is a path, relative to HGURL, where the repository is located
> +# HGURL + repo_path should be a valid repository
> +BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = 'releases/mozilla-b2g37_v2_2'
> +BRANCHES['mozilla-b2g37_v2_2']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
> +BRANCHES['mozilla-b2g34_v2_1']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'

not updated ^

@@ +1752,5 @@
> +BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux64-b2g-haz']['enable_nightly'] = False
> +BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-kk']['enable_nightly'] = True
> +BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator-kk-debug']['enable_nightly'] = True
> +BRANCHES['mozilla-b2g37_v2_2']['platforms']['dolphin']['enable_nightly'] = True
> +

missing dolphin_eng from m-c
Attachment #8545257 - Flags: review?(hwine) → review-
Attached patch v2.2-buildbot-configs-2.diff (obsolete) — Splinter Review
Attachment #8545257 - Attachment is obsolete: true
Attachment #8545370 - Flags: review?(hwine)
Attachment #8543054 - Flags: review?(hwine) → review+
Attachment #8543278 - Flags: review?(hwine) → review+
Attachment #8543282 - Flags: review?(hwine) → review+
Comment on attachment 8545370 [details] [diff] [review]
v2.2-buildbot-configs-2.diff

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

lgtm with branch key changed
Attachment #8545370 - Flags: review?(hwine) → review+
Attachment #8543283 - Flags: review?(hwine) → review+
Depends on: 1119506
Attachment #8543994 - Flags: review?(hwine) → review+
Attachment #8545338 - Flags: review?(hwine) → review+
Comment on attachment 8545344 [details] [diff] [review]
gecko_legacy.diff

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

r- also needs to be added to for loop near line 44
Attachment #8545344 - Flags: review?(hwine) → review-
Attachment #8545347 - Flags: review?(hwine) → review+
Comment on attachment 8545356 [details] [diff] [review]
gecko_l10n_new_pause.diff

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

this is to temporarily disable conversion during merge
Attachment #8545356 - Flags: review?(hwine) → review+
Attachment #8545344 - Attachment is obsolete: true
Attachment #8546184 - Flags: review?(hwine)
Comment on attachment 8545357 [details] [diff] [review]
gecko_l10n_new_start.diff

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

to re-enable l10n
Attachment #8545357 - Flags: review?(hwine) → review+
Comment on attachment 8545359 [details] [diff] [review]
gaia_l10n_new.diff

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

assuming will be landed after l10n repos created
Attachment #8545359 - Flags: review?(hwine) → review+
Attachment #8545364 - Flags: review?(hwine) → review+
Attachment #8546184 - Flags: review?(hwine) → review+
The hg templates changes have been deployed.
Refreshed the configs patches to incorporate http://hg.mozilla.org/build/buildbot-configs/rev/7fe645e9970f for the new branch. Also bumped the gecko version since the patch will be landed during the merge day.

Carry over r+ in case we start the merge day procedure early EST (the interdiff https://gist.github.com/rail/b541d2fcdfaee2daac54 is quite straight forward)
Attachment #8545370 - Attachment is obsolete: true
Attachment #8547191 - Flags: review+
To be landed after the merge (for the next merge day).
Attachment #8547192 - Flags: review?(hwine)
Comment on attachment 8545359 [details] [diff] [review]
gaia_l10n_new.diff

We're not branching gaia l10n yet
Attachment #8545359 - Attachment is obsolete: true
Attached patch graphs.diffSplinter Review
Attachment #8547822 - Flags: review?(nthomas)
Comment on attachment 8547822 [details] [diff] [review]
graphs.diff

*stamp*
Attachment #8547822 - Flags: review?(nthomas) → review+
Attachment #8547192 - Flags: review?(hwine) → review+
Comment on attachment 8549019 [details] [diff] [review]
mozharness-revert-gecko-l10n-changes.diff

Thanks Rail! Will land and merge to production branch this morning.
Attachment #8549019 - Flags: review?(pmoore) → review+
Comment on attachment 8549019 [details] [diff] [review]
mozharness-revert-gecko-l10n-changes.diff

In production: https://hg.mozilla.org/build/mozharness/rev/6415346ee811
Comment on attachment 8545338 [details] [diff] [review]
gaia-legacy.diff

For the record - this actually missed creation of the 'mapfile_needed' file. See bug 1122284 comment 5
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Component: General Automation → General
You need to log in before you can comment on or make changes to this bug.