1187060 - Create 2.2r branches for the b2g-manifest and gaia repos at https://github.com/mozilla-b2g

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::Build, defect)

Description

[Hal Wine [:hwine] use NI!]

per bug 1177598 a new branch is wanted. Lots of work "done", but no branch. For bug 1186295 we really need that branch. (Tough to mirror what doesn't exist.)

Comment 1

[Josh Cheng [:josh]]

Hi Hal,
Thanks for the help here.
Do you have a target date for both this one and bug 1186295?

Comment 2

[Hal Wine [:hwine] use NI!]

(In reply to Josh Cheng [:josh] from comment #1)
> Hi Hal,
> Thanks for the help here.
> Do you have a target date for both this one and bug 1186295?

Josh - the b2g team handles all gaia branching. That's why it's in their component.

Comment 3

[Josh Cheng [:josh]]

Hi Vincent,
Could you please help to create 2.2r gaia branch like 2.1s?
KaiZhen told me he ever did this with you for 2.1s.
Thanks!

Comment 4

[Wesley Huang [:wesley_huang] (EPM) (NI me)]

As Vincent is shifting his focus back to multimedia platform, I don't think he is obligated on this (But I'll be glad if he can help).

So, who else has the know-how and can take this task? (NI to John, Hal)
We are somewhat in a risk of delaying delaying development (inclusive of partner's contribution).

Comment 5

[Ryan VanderMeulen [:RyanVM]]

b2g-manifest will need branching as well. Not sure what others will on top of that (if any).

Comment 6

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Wesley Huang [:wesley_huang] (EPM) (NI me) from comment #4)
> As Vincent is shifting his focus back to multimedia platform, I don't think
> he is obligated on this (But I'll be glad if he can help).
> 
> So, who else has the know-how and can take this task? (NI to John, Hal)
> We are somewhat in a risk of delaying delaying development (inclusive of
> partner's contribution).

I'm don't currently have the context required to drive this.  I think Hal has done work on this a lot more recently than me.

Comment 7

[Chris AtLee [:catlee]]

For both gaia and b2g-manifests, the following needs to be done:

> git checkout v2.2r v2.2  # Creates a new branch v2.2r based on the current v2.2 tip
> git push --dry-run origin v2.2r  # Verify that only the new v2.2r branch is being pushed
> git push origin v2.2r

Comment 8

[Chris AtLee [:catlee]]

You may also want to modify the manifests in the new v2.2r branch to point to v2.2r branches in other repositories; or you can leave them pointing at v2.2 repositories. 

After the gaia and b2g-manifest branches are created we can enable the bumper for v2.2r.

Comment 9

[Chris AtLee [:catlee]]

One change for the b2g-manifests will be to point gaia at the 'v2.2r' branch. e.g. https://github.com/mozilla-b2g/b2g-manifest/blob/v2.2/emulator.xml#L17 should be changed from "v2.2" to "v2.2r"

Comment 10

[Hal Wine [:hwine] use NI!]

(In reply to John Ford [:jhford] -- please use 'needinfo?' instead of a CC from comment #6)
> I'm don't currently have the context required to drive this.  I think Hal
> has done work on this a lot more recently than me.

Nope - git branching of b2g was only done by releng once or twice in the 1.x days. Seeing if :mwu has context or docs to share to extend what :catlee has added already.

Comment 11

[Michael Wu [:mwu]]

Nothing to add - sounds about right, but I've never done a branch myself.

Comment 12

[Wesley Huang [:wesley_huang] (EPM) (NI me)]

Hi David,
Would you mind taking a look at this?

Comment 13

[Wesley Huang [:wesley_huang] (EPM) (NI me)]

(In reply to Hal Wine [:hwine] (out til Aug 3) from comment #2)
> (In reply to Josh Cheng [:josh] from comment #1)
> > Hi Hal,
> > Thanks for the help here.
> > Do you have a target date for both this one and bug 1186295?
> 
> Josh - the b2g team handles all gaia branching. That's why it's in their
> component.

Hi Hal and all,
To me 2.2r is not a device branch. 
Instead, 2.2r is the smart feature phone branch which we'll add various features on top so to me it's something like 2.2.x.
Moreover, b2g team no longer has dedicated resource to handle such gaia repo even for device branch. (that's a separate issue).
More importantly for now, will someone handle this task please?

Comment 14

[David Flanagan [:djf]]

I'll create the 2.2r gaia branch on github.

Comment 15

[David Flanagan [:djf]]

New branches:

https://github.com/mozilla-b2g/gaia/tree/v2.2r
https://github.com/mozilla-b2g/b2g-manifest/tree/v2.2r

I hope this is what was was needed for release engineering and automation.

Comment 16

[Ryan VanderMeulen [:RyanVM]]

Also update the manifests to point to the Gaia v2.2r branch:
v2.2r: https://github.com/mozilla-b2g/b2g-manifest/commit/0a54697d213d1ee6dc393fc89909a445f55dad7f

Josh and I discussed this bug a little bit last week and both feel that we probably don't need to worry about any other v2.2r-specific branching at this point. If and when any other repos need a branch, we can handle it at that time.

Comment 17

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r/rev/57e3eaae2115