1222019 - Various manifests on the v2.5 b2g-manifest branch are still pointing at master instead of the v2.5 branch

Status: RESOLVED WONTFIX

(Release Engineering :: General, defect)

Description

[Ryan VanderMeulen [:RyanVM]]

As seen in https://hg.mozilla.org/releases/mozilla-b2g44_v2_5/rev/405ccf140591

So far, at least base-jb.xml and base-kk.xml are affected. I haven't thoroughly audited all the rest, but it's clearly causing Bumper Bot confusion.

Comment 1

[Rail Aliiev [:rail]]

It may be related to the fact that we "flatten" the manifests as part of branching. See https://github.com/mozilla-b2g/b2g-manifest/commit/99881044aa5a29ac6a6e9f67d4f962ce28f49630. So base-*.xml files are used only by some other devices, not touched by bumper.

Does it make sense?

Comment 2

[Ryan VanderMeulen [:RyanVM]]

The link in comment 0 clearly shows two device manifests picking up Gaia master changes on the v2.5 branch.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Band-aid fix for the current issue:
v2.5: https://github.com/mozilla-b2g/b2g-manifest/commit/938bbbbd6f41238694e6237d42497026847fd3f7

We'll still want to discuss for the longer-term what rail brought up in comment 1 and IRC. The Dolphin and Nexus 4 (JB) devices aren't seen as supported devices, which is why the merge day scripts didn't update their manifests.

https://dxr.mozilla.org/mozilla-central/source/testing/mozharness/configs/merge_day/b2g_branch_repos.py#37