819368 - Please create temporary shira project branch

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Alex Keybl [:akeybl]]

Please create a temporary shira project branch based off of mozilla-b2g18. We'd like flashable otoro/unagi builds for developers to test. Updates on this branch will not be necessary.

We're still trying to find out where the associated GitHub Gaia branch will live.

Comment 1

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

per private email w/akeybl, this is for B2G v1.1 work. Kicking to hwine, as he's already working on some of this...

Comment 2

[Kev Needham [:kev]]

Hey folks,

Sorry to be a pain, but are there any items that are needed from Product or other groups to get this set up? We'd like to start landing changes ASAP, and I want to make sure there are no blockers from our side (and clear them if there are).

Comment 3

[Hal Wine [:hwine] use NI!]

Several questions regarding this branch:

1) any business reason a normal twig can't be used?

2) what, if any, is the need to provide mozilla.org hosted git repo access to this branch?

3) assuming this is lower priority than C2 work (but just behind this). Let me know if there's value to having a place to commit prior to builds being available.

Comment 4

[Alex Keybl [:akeybl]]

(In reply to Hal Wine [:hwine] from comment #3)
> Several questions regarding this branch:
> 
> 1) any business reason a normal twig can't be used?

As long as we can get builds off this branch

> 2) what, if any, is the need to provide mozilla.org hosted git repo access
> to this branch?

I don't have a need here, we just need to be able to pull a different Gaia GH repo/branch into the flashable builds.

> 3) assuming this is lower priority than C2 work (but just behind this). Let
> me know if there's value to having a place to commit prior to builds being
> available.

This is lower priority than mozilla-b2g18 bring-up, but does need to be brought up asap.

Comment 5

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

I'm not 100% percent sure of how things should work here. But for Gaia I would say:
 - Create a 1.1 branch based on the nightly branch
 - Regularly merge the nightly branch into the 1.1 branch
 - Once 1.1 is ready it can be merge back to the master branch.

The main reason for not using master directly is probably because it can be broken / subject to many changes.

Comment 6

[Kev Needham [:kev]]

1) I'll defer to Alex on point 1. My understanding is that because of the ongoing work on 1.0, there's a need to keep this build separate in a temp container so that the work here doesn't affect the work being done on 1.0. My expectation is the work would be merged back into the project after 1.0 is finalized, but what we need to be able to do is land mods and generate 1.1 builds starting in the very short term (like, asap). The expectation is that we'd be using this for a few months until this happens, but I confess I don't know enough to answer point 1 authoritatively. Alex, can you address?

2) 1.1 will incorporate changes to both gecko and gaia. like gecko, we need a separate container for 1.1 gaia changes that go with. If this makes no sense, I'll defer to Alex again :)

3) v1.1 is being developed in parallel (the changes are relatively minor) and there's a need to land those changes separate from 1.0 work and generate builds from them. We need to provide a code sample for Dec 21, which means starting to land modifications asap. I'd ask that we figure out how to get this done as soon as possible, it's an urgent request (and I apologize in advance for headaches)

Comment 7

[Kai-Chih Hu [:khu]]

Do we have an ETA for the branch? 
Dec 21th is the date of code drop, and it's coming.

Comment 8

[Vicamo Yang [:vicamo][:vyang]]

(In reply to Vivien Nicolas (:vingtetun) from comment #5)
> I'm not 100% percent sure of how things should work here. But for Gaia I
> would say:
>  - Create a 1.1 branch based on the nightly branch
>  - Regularly merge the nightly branch into the 1.1 branch
>  - Once 1.1 is ready it can be merge back to the master branch.
> 
> The main reason for not using master directly is probably because it can be
> broken / subject to many changes.

The same reason for RIL. We have other non-1.0, non-1.1 works to do. Some of them alter existing DOM APIs and many other stuff and will result in painful, unnecessary rebase works between m-c and beta. I hope we can invent a way to land bb+ code in v1.0 branch and merge it back to m-c periodically. For v1.1, we'll also need yet another branch to land related changes. All non-1.0, non-1.1 works should go to m-i/m-c.

Comment 9

[Hal Wine [:hwine] use NI!]

(In reply to khu from comment #7)
> Do we have an ETA for the branch? 

There are 2 parts to this (or any b2g) branching:
 a) setting up the gecko branch to receive commits
 b) setting up the builds, which require knowing the gaia branch to use

Part (a) should be completed sometime Wed Dec 12, as originally requested in comment #1. If the request is changed, another day will be needed.

Part (b) is dependent upon knowing the gaia branch name - I'll flag Vivien for that information.

Comment 10

[Hal Wine [:hwine] use NI!]

Vivien - you were identified in email as the person who would name & create the gaia branch. Can you put that name here please?

Comment 11

[Alex Keybl [:akeybl]]

We're following up in email to find somebody to create the associated Gaia shira branch off of master, as Vivien suggests in comment 5.

Comment 12

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

I'll throw back at hal when the branch is created

Comment 13

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

I've created the shira branch on Github

https://github.com/mozilla-b2g/gaia/tree/shira

Based on the contents of Nighty, per Vivien's suggestion.  We should probably create a b2g-manifest branch for this work.  What is the Git branch name for the gecko 1.1 shira branch?

Comment 14

[Hal Wine [:hwine] use NI!]

At the moment, the releng machinery does not directly follow sources.xml or b2g-manifests for our builds. (Alternate methods are used.)

In particular, both the gecko & gaia pointers are taken directly from releng config files, and will be set for the shira work as:
 - the tip of the hg repository for gecko (the one this bug is creating),
 - the tip of the shira branch on gaia (created in comment 13).
 - the current "gonk bundle" used by b2g 1.0 (everything except gaia & gecko)

If a different "gonk bundle" is needed, the team will need to open a request with releng to have that bundle made available.

Thus, no branching of b2g-manifest is needed to support this build/bug.

Comment 15

[Hal Wine [:hwine] use NI!]

The http://hg.mozilla.org/projects/date repository has been created and is available for the shira team. It has been initialized with the mozilla-beta branch from a few days ago, prior to the switch to mozilla-b2g18 work.

I've allocated the "date" branch on the [[https://wiki.mozilla.org/ReleaseEngineering/DisposableProjectBranches#BOOKING_SCHEDULE wiki page]] - some of the contact and date info may need updating.

A few steps remain before b2g builds will occur properly, but the developers can start using the repository.

Comment 16

[Hal Wine [:hwine] use NI!]

The builds should now work properly - they can be configured as normal for a twig by following the instructions at:
 https://wiki.mozilla.org/ReleaseEngineering/DisposableProjectBranches

For the gaia repo, you should specify 
 https://hg.mozilla.org/integration/gaia-shira
in the appropriate b2g/configs/*/config.py in the working directory. Note that this hg repository will lag the github one by around 20 minutes. You can use the URL above to verify the contents.

If there are any build issues, please open a separate bug for them.

Comment 17

[Kev Needham [:kev]]

Thanks Hal for the update and follow-through, on this. 

Kevin, does everyone know where to land code and the process to do so?

Comment 18

[Kai-Chih Hu [:khu]]

Trying to double confirm with everyone. :)

Comment 19

[Hal Wine [:hwine] use NI!]

Attachment: point unagi build to shira version of gaia

move to correct gaia branch per emails

Comment 20

[Hal Wine [:hwine] use NI!]

Comment on attachment 696062 [details] [diff] [review]
point unagi build to shira version of gaia

committed:
http://hg.mozilla.org/projects/date/rev/20d37e842a1b