834098 - Tag branchpoint where B2G v1.0.0 branched from v1.0.x

Status: RESOLVED FIXED

(Release Engineering :: Release Requests, defect, P1)

Description

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

On Friday 25th, we expect to get a "go to tag" gaia and mozilla-b2g18 for the B2G / FFOS v1.0.1 source drop. 

Filing bug to track, while we wait for exact time and changeset to tag.

If we do for v1.0.1 on the 25th the same as we did for v1.0.0 on the 15th, then:
* we expect this changeset to match up with the changeset of the most recently signed off "suitable-for-dogfooders" nightly build.
* we expect to tag the "gaia" and "mozilla-b2g18" repos, and have these tags replicated to the downstream git.m.o repos.

Comment 1

[[e-mail] (:bhearsum)]

Is there someone expected to be on the hook for this?

Comment 2

[u429623]

The tags are to mark the start of v1.0.0

for gaia.git:
  git tag B2G_1_0_0_20130125190500 f467577
for gecko.git:
  hg tag -r b8be056ac8d8 -m 'branch base for v1.0.0 & v1.0.1'  B2G_1_0_0_20130125190500

Tags have propagated to git.mozilla.org:/releases/{gaia,gecko}.git

Comment 3

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

per email from mvines, its good that we tagged:
...
>>>>> releases/gaia.git
>>>>> releases/gecko.git
...
and he would also like us to tag:
...
>>>>> b2g/B2G.git
>>>>> b2g/fake-dalvik.git
>>>>> b2g/gonk-misc.git
>>>>> b2g/librecovery.git
>>>>> b2g/moztt.git
>>>>> b2g/platform_external_opensans.git
>>>>> b2g/screencap-gonk.git
...

Reopening to track.

Comment 4

[Michael Vines [:m1] [:evilmachines]]

Thanks.  FWIW, my pref is to branch those extra projects into a v1.0.0 branch in the event that we want/need to land other TEF+ stuff after the tag.

Comment 5

[Michael Vines [:m1] [:evilmachines]]

I noticed a couple other repositories that probably need branching or tagging:

releases/l10n/ar/gaia.git
releases/l10n/en-US/gaia.git
releases/l10n/es-ES/gecko.git
releases/l10n/es/gaia.git
releases/l10n/pt-BR/gaia.git
releases/l10n/pt-BR/gecko.git

Comment 6

[Michael Vines [:m1] [:evilmachines]]

P1 because I'm seeing developers now making non-v1.0.0 changes in the repositories that have yet to be branched, so we need a solution here quickly.

Comment 7

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

Should we also be adding v1-train ones?  It's conceivable that someone makes a v1-train incompatible change to these repositories while working on a v2 bug.

Comment 8

[u429623]

(In reply to John Ford [:jhford] from comment #7)
> Should we also be adding v1-train ones?  It's conceivable that someone makes
> a v1-train incompatible change to these repositories while working on a v2
> bug.

:joduinn can you answer?

Comment 9

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

(In reply to John Ford [:jhford] from comment #7)
> Should we also be adding v1-train ones?  It's conceivable that someone makes
> a v1-train incompatible change to these repositories while working on a v2
> bug.

Good question, but no need until the next big branch/migration on 15feb. Until that time, RelCoordinators are only allowing changes for v1.1 and beyond to land on m-c (gecko) / master (gaia). Therefore, I'd leave that as beyond scope of this bug.

On that date, when we do branch/migration, its not clear to me whether we should create v1.0.1 tags or v1-train tags... or both... but we should have that info figured out before we start the branching on the day. That work can be track in separate branch/migration bug.

Comment 10

[Michael Vines [:m1] [:evilmachines]]

Actually I think John's comment 7 is in scope.   The projects from comment 3 currently share a master branch between v1.0.0, v1-train, and "master".    We probably should have the same three branches in these projects as just like gecko/gaia.

Comment 11

[u429623]

tags & branches have been created for all git repos referenced in the sources.xml used for the Jan 25 code drop and hosted at git.mozilla.org:b2g/* as follows:

android-device-otoro.git:
7662275433fc0b1d8b035f03185b24b7ca965ab4 refs/heads/v1.0.0
7662275433fc0b1d8b035f03185b24b7ca965ab4 refs/tags/B2G_1_0_0_20130125190500
android-device-unagi.git:
6c014552d1b26bee611d9a9b23bd4cd014e392ee refs/heads/v1.0.0
6c014552d1b26bee611d9a9b23bd4cd014e392ee refs/tags/B2G_1_0_0_20130125190500
codeaurora_kernel_msm.git:
0a01247e4b0880f93424b27251cd3a1f6b19dbb2 refs/heads/v1.0.0
0a01247e4b0880f93424b27251cd3a1f6b19dbb2 refs/tags/B2G_1_0_0_20130125190500
fake-dalvik.git:
ca1f327d5acc198bb4be62fa51db2c039032c9ce refs/heads/v1.0.0
ca1f327d5acc198bb4be62fa51db2c039032c9ce refs/tags/B2G_1_0_0_20130125190500
gonk-misc.git:
2f8c7d3546bda16b02a61b422786919875c19f15 refs/heads/v1.0.0
2f8c7d3546bda16b02a61b422786919875c19f15 refs/tags/B2G_1_0_0_20130125190500
hardware_qcom_display.git:
6405d30f2fac7d8a1f2cb17b99fb7dd0a8bcfdac refs/heads/v1.0.0
6405d30f2fac7d8a1f2cb17b99fb7dd0a8bcfdac refs/tags/B2G_1_0_0_20130125190500
librecovery.git:
601fc18b28c9d7cf6954b281ddd3b705c74a9215 refs/heads/v1.0.0
601fc18b28c9d7cf6954b281ddd3b705c74a9215 refs/tags/B2G_1_0_0_20130125190500
moztt.git:
6ee1f8987ef36d688f97064c003ad57849dfadf2 refs/heads/v1.0.0
6ee1f8987ef36d688f97064c003ad57849dfadf2 refs/tags/B2G_1_0_0_20130125190500
platform_build.git:
0784cdcb29ae45e5bf903cc03fa1bc206162665b refs/heads/v1.0.0
0784cdcb29ae45e5bf903cc03fa1bc206162665b refs/tags/B2G_1_0_0_20130125190500
platform_external_opensans.git:
b5b4c226ca1d71e936153cf679dda6d3d60e2354 refs/heads/v1.0.0
b5b4c226ca1d71e936153cf679dda6d3d60e2354 refs/tags/B2G_1_0_0_20130125190500
rilproxy.git:
2d380d27c86263537f6b829cd0238f5dd702c735 refs/heads/v1.0.0
2d380d27c86263537f6b829cd0238f5dd702c735 refs/tags/B2G_1_0_0_20130125190500
screencap-gonk.git:
e6403c71e9eca8cb943739d5a0a192deac60fc51 refs/heads/v1.0.0
e6403c71e9eca8cb943739d5a0a192deac60fc51 refs/tags/B2G_1_0_0_20130125190500
unbootimg.git:
9464623d92eb8668544916dc5a8f4f6337d0bc08 refs/heads/v1.0.0
9464623d92eb8668544916dc5a8f4f6337d0bc08 refs/tags/B2G_1_0_0_20130125190500

Comment 12

[u429623]

John, can you please adjust the v1.0.0 manifests to reference the v1.0.0 branches?

ping back when done for us to create a new snapshot

Comment 13

[u429623]

tags have been created for all l10n git repos referenced in the sources.xml (by hg hash) used for the Jan 25 code drop and hosted at git.mozilla.org:releases/l10n/* as follows:

releases/l10n/beta/es-ES/gecko:
1105b448091c06b6a08bbd4a30ced629c04f1636 refs/tags/B2G_1_0_0_20130125190500
releases/l10n/beta/pt-BR/gecko:
526e5dbf81629bc2dd65b2bc787bb15a529541e9 refs/tags/B2G_1_0_0_20130125190500
releases/l10n/ar/gaia:
a18fba2b780813a3692e57feeabf9bd1924444a8 refs/tags/B2G_1_0_0_20130125190500
releases/l10n/en-US/gaia:
e2c171979c736469f3559dfac14fb6a96d531896 refs/tags/B2G_1_0_0_20130125190500
releases/l10n/es/gaia:
9f9dfb79a3d180b9ccbda705b6177bcac79415eb refs/tags/B2G_1_0_0_20130125190500
releases/l10n/fr/gaia:
e55256f47d80d43f9bf3f1b9a6fcf0b0dc4918b0 refs/tags/B2G_1_0_0_20130125190500
releases/l10n/pt-BR/gaia:
e117bc0df7d0dd6b264535746dde09921e56c3a7 refs/tags/B2G_1_0_0_20130125190500
releases/l10n/zh-TW/gaia:
1ec132e4f63f25732db3dd1f5de9532d822b6d3c refs/tags/B2G_1_0_0_20130125190500

No manifest action is needed on this.

Comment 14

[u429623]

(In reply to Hal Wine [:hwine] from comment #12)
> John, can you please adjust the v1.0.0 manifests to reference the v1.0.0
> branches?

Moving this separate action to a new bug 837015 for better tracking.

Closing this bug as done for v1.0.0