836319 - Create v1.0.1 branch in b2g-manifest and gaia

Status: RESOLVED FIXED

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

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

(Bug#835467 originally included this, but morphed. Filing separate bug after discussion w/jhford yesterday, as he'd already completed bug#835467 and was about to close it.)

Please create "v1.0.1" branch in b2g-manifest and gaia repos. 

These new "v1.0.1" branches would not yet be used by developers, or builds, until the branch point in ~2weeks. However, we need these to finish setup and testing of repo replication, and v1.0.1 build infrastructure in advance of the branch point in ~2weeks time. For details of other work involved as preparation for this branch point, see bug#832503 or ping me.

Comment 1

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

cc-ing jhford who verbally expressed preference earlier this week in doing this. We need this to complete setup of v1.0.1 branch, so if workload has shifted, please let us know and we can create instead. No worries either way.

Comment 2

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

(In reply to John O'Duinn [:joduinn] from comment #0)
> (Bug#835467 originally included this, but morphed.

That bug was always exclusively about v1-train and v1.0.0.  This request is not related to the purpose of 835467.

Comment 3

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

Alex, I wanted to confirm that this fits with release management plans.  If it's OK with you, I'll create the branches.

Comment 4

[Alex Keybl [:akeybl]]

No issue with creating v1.0.1 for b2g-manifest already, but I am concerned that creating v1.0.1 on Gaia will be confusing to developers (since they're meant to be landing on v1-train). Is there any way we can avoid that? Perhaps using a temporary GitHub repo for this testing?

Comment 5

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

(In reply to John Ford [:jhford] from comment #3)
> Alex, I wanted to confirm that this fits with release management plans.  If
> it's OK with you, I'll create the branches.

(In reply to Alex Keybl [:akeybl] from comment #4)
> No issue with creating v1.0.1 for b2g-manifest already, 
Cool.


> but I am concerned
> that creating v1.0.1 on Gaia will be confusing to developers (since they're
> meant to be landing on v1-train). Is there any way we can avoid that?
> Perhaps using a temporary GitHub repo for this testing?

Its software, so anything is possible. :-) However, rigging up fake repos with this branch complicates our automation/branching testing significantly all of which we'll have to redo and re-test for the real repos/branch when the branch-point comes. Given that tbpl, and landing pages, clearly denote v1.0.1 as closed/offlimits right now, and we've locked down the hg repos, it feels to me like we've already taken all appropriate steps to address the potential confusion. If you have other concerns, can you elaborate?

Comment 6

[Alex Keybl [:akeybl]]

(In reply to John O'Duinn [:joduinn] from comment #5)
> Its software, so anything is possible. :-) However, rigging up fake repos
> with this branch complicates our automation/branching testing significantly
> all of which we'll have to redo and re-test for the real repos/branch when
> the branch-point comes. Given that tbpl, and landing pages, clearly denote
> v1.0.1 as closed/offlimits right now, and we've locked down the hg repos, it
> feels to me like we've already taken all appropriate steps to address the
> potential confusion. If you have other concerns, can you elaborate?

Spoke with joduinn in person. He suggested we could just add warning text at the top of the GitHub page that says something to the effect of "Please ignore the v1.0.1 branch, v1.0.1 work should land on the v1-train branch. See https://wiki.mozilla.org/Release_Management/B2G_Landing for other landing details". If that's possible, no issue with moving forward now.

Comment 7

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

Branch created: https://github.com/mozilla-b2g/gaia/tree/v1.0.1

John, please create that banner on github as soon as possible.

Comment 8

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

(In reply to John Ford [:jhford] from comment #7)
> Branch created: https://github.com/mozilla-b2g/gaia/tree/v1.0.1
> 
> John, please create that banner on github as soon as possible.

Done.

Anything else left to do here, or can we now close this bug?

Comment 9

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

(In reply to John O'Duinn [:joduinn] from comment #8)
> (In reply to John Ford [:jhford] from comment #7)
> > Branch created: https://github.com/mozilla-b2g/gaia/tree/v1.0.1
> > 
> > John, please create that banner on github as soon as possible.
> 
> Done.
> 
> Anything else left to do here, or can we now close this bug?

jhford: I was about to close this bug, but just noticed that the v1.0.1 branch was not created in b2g-manifest. Can you get to that asap? We need it for our final test run today, in prep for tomorrow morning's branching.

Comment 10

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

$ git rev-list ^v1-train v1.0.1
4a92669eb25946ab28f3294928df4f34c74f5d3f
$ git push origin v1.0.1
Counting objects: 21, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.66 KiB, done.
Total 11 (delta 9), reused 0 (delta 0)
To github.com:mozilla-b2g/b2g-manifest.git
 * [new branch]      v1.0.1 -> v1.0.1

This change assumes that the commits on v1.0.1 are the same commits that are on v1-train, which they should be if the repos were branched properly.