Closed Bug 948097 Opened 6 years ago Closed 6 years ago

b2g merge day work

Categories

(Release Engineering :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: hwine, Assigned: hwine)

References

Details

Attachments

(6 files, 3 obsolete files)

need to:
 - bump versions in mozharness
 - create l10n repos
Attached patch mozharness.patchSplinter Review
Attachment #8344858 - Flags: review?(aki)
Comment on attachment 8344858 [details] [diff] [review]
mozharness.patch

Lgtm.
Attachment #8344858 - Flags: review?(aki) → review+
Depends on: 948141
Attached patch enable b2g on m-a (obsolete) — Splinter Review
Add b2g builds on aurora back in by backout of http://hg.mozilla.org/build/buildbot-configs/rev/9f7687feb5f8

Also, other MERGE day version bumps
Attachment #8344972 - Flags: review?(aki)
Comment on attachment 8344972 [details] [diff] [review]
enable b2g on m-a

>diff --git a/mozilla-tests/b2g_config.py b/mozilla-tests/b2g_config.py

We might be able to get rid of this block http://hg.mozilla.org/build/buildbot-configs/file/e38095f45230/mozilla-tests/b2g_config.py#l1448

We might be able to just leave b2g18 and b2g18_v1_1_0_hd in this block http://hg.mozilla.org/build/buildbot-configs/file/e38095f45230/mozilla-tests/b2g_config.py#l1457

>diff --git a/mozilla-tests/mobile_config.py b/mozilla-tests/mobile_config.py

I think we can get rid of the references to mozilla-b2g18_v1_0_1 in here.

>diff --git a/mozilla/b2g_config.py b/mozilla/b2g_config.py
>-######## mozilla-b2g26_v1_2
>+######## mozilla-aurora
> # This is a path, relative to HGURL, where the repository is located
> # HGURL + repo_path should be a valid repository
>+BRANCHES['mozilla-aurora']['repo_path'] = 'releases/mozilla-aurora'
<snip>
>+BRANCHES['mozilla-aurora']['platforms']['hamachi_eng']['enable_nightly'] = True
>+BRANCHES['mozilla-aurora']['platforms']['hamachi_eng']['consider_for_nightly'] = False
>+BRANCHES['mozilla-aurora']['platforms']['helix']['enable_nightly'] = True
> BRANCHES['mozilla-b2g26_v1_2']['repo_path'] = 'releases/mozilla-b2g26_v1_2'
> BRANCHES['mozilla-b2g26_v1_2']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v1_2'
> BRANCHES['mozilla-b2g26_v1_2']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'

This is odd, in that you're changing the header to the section to "mozilla-aurora", then have some b2g26_v1_2 stuff mixed in.
I think it would make more sense if you copied the whole block, and then changed all the b2g26_v1_2's in one of them to aurora's.

> # Per bug https://bugzilla.mozilla.org/show_bug.cgi?id=917692#c14 , localizer
> # builds not needed for B2G 1.2
>-BRANCHES['mozilla-b2g26_v1_2']['platforms']['linux32_gecko_localizer']['enable_nightly'] = False
>-BRANCHES['mozilla-b2g26_v1_2']['platforms']['linux64_gecko_localizer']['enable_nightly'] = False
>-BRANCHES['mozilla-b2g26_v1_2']['platforms']['macosx64_gecko_localizer']['enable_nightly'] = False
>-BRANCHES['mozilla-b2g26_v1_2']['platforms']['win32_gecko_localizer']['enable_nightly'] = False
>+BRANCHES['mozilla-aurora']['platforms']['linux32_gecko_localizer']['enable_nightly'] = False
>+BRANCHES['mozilla-aurora']['platforms']['linux64_gecko_localizer']['enable_nightly'] = False
>+BRANCHES['mozilla-aurora']['platforms']['macosx64_gecko_localizer']['enable_nightly'] = False
>+BRANCHES['mozilla-aurora']['platforms']['win32_gecko_localizer']['enable_nightly'] = False

Above you added mozilla-aurora stuff to the b2g26_v1_2 stuff, but here you're replacing, so I think this block will enable localizer nightlies on b2g26_v1_2.  Also fixed if you copy the whole block and edit one, as mentioned above.

> # MERGE DAY: inari is for B2G 1.0+ (b2g18_v1_0_1, b2g18 + gecko26 and higher)
>+# When gecko27 is on aurora we don't run B2G builds there, but will on beta
> for branch in BRANCHES:
>-    if branch not in ('mozilla-central', 'b2g-inbound', 'mozilla-b2g26_v1_2',
>-                      'mozilla-b2g26_v1_2f', 'mozilla-b2g18', 'mozilla-b2g18_v1_0_1'):
>+    if branch not in ('mozilla-aurora', 'mozilla-central', 'b2g-inbound',
>+                      'mozilla-b2g26_v1_2', 'mozilla-b2g26_v1_2f',
>+                      'mozilla-b2g18', 'mozilla-b2g18_v1_0_1'):

I think you can drop v1_0_1

> # MERGE DAY: hamachi is for B2G 1.0+ (b2g18_v1_0_1, b2g18 + gecko26 and higher)
>+# When gecko27 is on aurora we don't run B2G builds there, but will on beta
> for branch in BRANCHES:
>-    if branch not in ('mozilla-central', 'b2g-inbound', 'mozilla-b2g26_v1_2',
>-                      'mozilla-b2g26_v1_2f', 'mozilla-b2g18', 'mozilla-b2g18_v1_0_1'):
>+    if branch not in ('mozilla-aurora', 'mozilla-central', 'b2g-inbound',
>+                      'mozilla-b2g26_v1_2', 'mozilla-b2g26_v1_2f',
>+                      'mozilla-b2g18', 'mozilla-b2g18_v1_0_1'):

Here too.
This is making me wish we used the b2g_version or gecko_version stuff per branch, but I don't think this file is quite ready for that yet.

> # MERGE DAY: unagi_eng is for B2G 1.0+ (b2g18_v1_0_1, b2g18 + gecko26 and
> # higher)
>+# When gecko27 is on aurora we don't run B2G builds there, but will on beta
> for branch in BRANCHES:
>     if branch not in ('mozilla-b2g18', 'mozilla-b2g18_v1_0_1',
>-                      'mozilla-b2g26_v1_2', 'mozilla-b2g26_v1_2f', 'mozilla-central', 'b2g-inbound'):
>+                      'mozilla-aurora', 'mozilla-b2g26_v1_2',
>+                      'mozilla-b2g26_v1_2f', 'mozilla-central', 'b2g-inbound'):

Here too.
incorporates changes from comment 5
Attachment #8344972 - Attachment is obsolete: true
Attachment #8344972 - Flags: review?(aki)
Attachment #8344997 - Flags: review?(aki)
Attachment #8344997 - Flags: review?(aki) → review+
Attached patch vcs-sync.diffSplinter Review
m-a should push to v1.3 in gecko.git
Attachment #8345069 - Flags: review?(aki)
Comment on attachment 8345069 [details] [diff] [review]
vcs-sync.diff

> do_update_pass() {
>     # list of hg paths to update from
>-    for f in default beta b2g18 b2g18_v1_0_0 b2g18_v1_0_1 b2g18_v1_1_0_hd b2g26_v1_2 b2g26_v1_2f ; do
>+    for f in default auroroa beta b2g18 b2g18_v1_0_0 b2g18_v1_0_1 b2g18_v1_1_0_hd b2g26_v1_2 b2g26_v1_2f ; do

s,auroroa,aurora
r=me with that change.
Attachment #8345069 - Flags: review?(aki) → review+
Attached patch b2g-manifest.diff (obsolete) — Splinter Review
manifests for v1.3
Attachment #8345074 - Flags: review?(rail)
convert gaia v1.3 branch to hg repo
Attachment #8345087 - Flags: review?(aki)
Comment on attachment 8345087 [details] [diff] [review]
vcs-sync-gaia.diff

lgtm
Attachment #8345087 - Flags: review?(aki) → review+
in production
Attached patch b2g-manifest-2.diff (obsolete) — Splinter Review
Attachment #8345074 - Attachment is obsolete: true
Attachment #8345074 - Flags: review?(rail)
Attachment #8345098 - Flags: review?(rail)
3rd time a charm
Attachment #8345098 - Attachment is obsolete: true
Attachment #8345098 - Flags: review?(rail)
Attachment #8345102 - Flags: review?(rail)
Comment on attachment 8345102 [details] [diff] [review]
b2g-manifest-3.diff

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

::: helix.xml
@@ +105,4 @@
>    <!-- helix specific things -->
>    <project path="device/qcom/common" name="device/qcom/common"/>
>    <project path="device/qcom/msm7627a" name="platform/vendor/qcom/msm7627a"/>
> +  <project path="device/qcom/helix" name="device-helix" remote="b2g" revision="v1.3" /> 

I blame the script for adding a trailing space here. Can you remove it manually?
Attachment #8345102 - Flags: review?(rail) → review+
Looks like some of the l10n gits don't have v1.3 branches yet, is that a wip?

eg. http://git.mozilla.org/?p=releases/l10n/de/gaia.git;a=summary
Depends on: 949731
Attached patch gaia-l10n.diffSplinter Review
convert the v1.3 specific strings
Attachment #8346941 - Flags: review?(aki)
Comment on attachment 8346941 [details] [diff] [review]
gaia-l10n.diff

I don't think the spacing matters, but in case it does, zh-CN gaia seems to be off by one:

diff --git a/releases-l10n-zh-CN-gaia/config b/releases-l10n-zh-CN-gaia/config
--- a/releases-l10n-zh-CN-gaia/config
+++ b/releases-l10n-zh-CN-gaia/config
@@ -3,9 +3,10 @@
 	filemode = true
 	bare = true
 [remote "git.m.o"]
 	url = git+ssh://git.m.o/releases/l10n/zh-CN/gaia.git
 	mirror = true
 [gc]
 	auto = 0
 [mozilla "vcs-sync"]
 	renameremotev12defaultbranchto = v1.2
+        renameremotev13defaultbranchto = v1.3
Attachment #8346941 - Flags: review?(aki) → review+
Comment on attachment 8346941 [details] [diff] [review]
gaia-l10n.diff

http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/055cff194ea9

deployed on all production boxes

white space doesn't matter -- some of the files actually use tabs. :/
Attachment #8346941 - Flags: checked-in+
Comment on attachment 8345102 [details] [diff] [review]
b2g-manifest-3.diff

revision e5d06e060395cd13e1ddd12e89f109ebac99ced9 in 
http://git.mozilla.org/?p=b2g/b2g-manifest.git
Attachment #8345102 - Flags: checked-in+
(In reply to Michael Vines [:m1] [:evilmachines] from comment #19)
> Looks like some of the l10n gits don't have v1.3 branches yet, is that a wip?

Yes, the commit in comment 22 addresses this, and the branches should appear within the next few hours.
Pretty sure this is done.
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.