Services/Process/MergingBetweenBranches: Difference between revisions

Services/Process/MergingBetweenBranches (view source)

Revision as of 21:46, 20 April 2011

225 bytes added , 20 April 2011

no edit summary

Jarguello

canmove, Confirmed users

457

edits

@@ Line 1: / Line 1: @@
 Snapshot of http://etherpad.mozilla.org:9000/services-client-merge-process :
-* Merging feature branches to s-c
+== Merging feature branches to services-central ==
-** All changes must be reviewed and have appropriate test coverage
+* All changes must be reviewed and have appropriate test coverage
-** All changes requiring additional testing (read: QA) must have a documented test plan in place
+* All changes requiring additional testing (read: QA) must have a documented test plan in place
-** Any features requiring server-side deployments/changes must wait until those pieces are live on stage before merging
+* Any features requiring server-side deployments/changes must wait until those pieces are live on stage before merging
-* Merging from m-c to s-c
+== Merging from mozilla-central to services-central ==
-** Pull last green changeset into local s-c, merge
+* Pull last green changeset into local services-central, merge
-** Push to s-c
+* Push to services-central (Does services-ops need to do this?)
-** Verify green build in tbpl, including TPS (formerly Crossweave) — wait for the email.
+* Verify green build in tbpl, including TPS (formerly Crossweave) — wait for the email.
-** Perform frequently!
+* Perform frequently!
-* Merging from s-c to m-c
+== Merging from services-central to mozilla-central ==
-** Ensure all required changes have landed and the tree is green
+* Ensure all required changes have landed and the tree is green
-** Merge last green changeset from m-c to s-c (see above)
+* Merge last green changeset from m-c to services-central (see above)
-** Ensure everything stays green, including TPS (formerly Crossweave)
+* Ensure everything stays green, including TPS (formerly Crossweave)
-** Hand off tinderbox builds to QA
+* Hand off tinderbox builds to QA
-** Once QA signs off, merge the signed off changeset (not necessarily the s-c tip anymore) to m-c
+* Once QA signs off, merge the signed off changeset (not necessarily the services-central tip anymore) to mozilla-central
-* (Proposed) Timing
+== (Proposed) Timing ==
-** Hand off to QA on Monday
+* Hand off to QA on Monday
-** QA smoketests Monday + Tuesday
+* QA smoketests Monday + Tuesday
-** Merge on Tuesday
+* Merge on Tuesday
-* (Proposed) Schedule
+== (Proposed) Schedule ==
-** April 25/26: QA handoff + merge
+(To-do - add a link to a schedule or transclude a schedule)
-** May 9/10: QA handoff + merge
+* April 25/26: QA handoff + merge
-** May 17: Fx 6 merges to Aurora
+* May 9/10: QA handoff + merge
-* Open questions:
+* May 17: Fx 6 merges to Aurora
-** Is there any situation in which we would accede to a release driver's request for a merge? With or without urgent QA smoketesting?
+== Open questions: ==
-** What about small fixes that are desirable for m-c?
+* Is there any situation in which we would accede to a release driver's request for a merge? With or without urgent QA smoketesting?
-*** Land on m-c and merge
+* What about small fixes that are desirable for m-c?
-*** Land on s-c and transplant
+** Land on m-c and merge
-*** Do we need any process around transplanting?
+** Land on s-c and transplant
+** Do we need any process around transplanting?