Release Management/Requesting an Uplift: Difference between revisions

Jump to navigation Jump to search
Split out lando and phab uplifts with an intro for each section
(Correct moz-phab uplift parameters →‎Requesting Uplift using moz-phab)
(Split out lando and phab uplifts with an intro for each section)
Line 12: Line 12:
After submitting the patch stack via either method, you must complete the Uplift Request form on the tip of the patch stack. This will request review from Release Management.
After submitting the patch stack via either method, you must complete the Uplift Request form on the tip of the patch stack. This will request review from Release Management.


=== Requesting Uplift using ''moz-phab'' ===


# '''Find the patch or series of patches in your local VCS.''' You can ''moz-phab patch'' onto your local machine if need be.
== Uplifting a simple change that won't require local modification or testing  ==
# '''Determine which uplift train you want to request an uplift for.''' You can see which trains are available with ''moz-phab uplift --list-trains''.
 
# '''Run ''moz-phab uplift --train <train> <first revision of patches to uplift> <last revision of patches to uplift>''.''' Most of the arguments to ''moz-phab uplift'' are the same as ''moz-phab submit''. This will create new revisions in Phabricator that will be uplifted to the specified train. If ''moz-phab uplift'' is run from mozilla-unified, the stack of patches will be rebased onto the target that will be landed to. For example if you specify ''--train beta'', the patches will be rebased onto the ''beta'' head in your local VCS. If ''moz-phab uplift'' is run from central or another non-unified repo, the commits will be submitted without attempting to rebase them. Note you must use ''moz-phab uplift'', not ''moz-phab sumbit'' or any other unsupported tool to submit uplift requests.
If your Phabricator revision(s) are straightforward and won't require local testing prior to requesting an uplift you can use Lando to create the uplift revision.
# '''Open the URL as suggested at the bottom of the output.'''
Follow the '''Requesting Uplift using Lando''' process.
# '''Complete the uplift request form. See the section below on how to submit the form.'''


=== Requesting Uplift using Lando ===
=== Requesting Uplift using Lando ===
Line 27: Line 25:
# '''Click the “Preview Landing” button. There should be a new button on the bottom right of the modal that is shown.''' Select the target repo (beta) from the list and click “request uplift”. This will create a new Phabricator diff against the requested target. [[File:Request-uplift-button-lando.png|thumb|Click the "Request uplift" button in the bottom right.]]
# '''Click the “Preview Landing” button. There should be a new button on the bottom right of the modal that is shown.''' Select the target repo (beta) from the list and click “request uplift”. This will create a new Phabricator diff against the requested target. [[File:Request-uplift-button-lando.png|thumb|Click the "Request uplift" button in the bottom right.]]
# '''Complete the uplift request form in the newly created diff. See the section below on how to submit the form.'''
# '''Complete the uplift request form in the newly created diff. See the section below on how to submit the form.'''
== Uplifting a change that you want to apply and test locally first ==
If your Phabricator revision(s) require more attention, perhaps because it's expected they won't apply cleanly to the target, you'll need to apply the commit locally and submit using moz-phab.
Follow the '''Requesting Uplift using moz-phab''' process
=== Requesting Uplift using ''moz-phab'' ===
# '''Ensure you are using the mozilla-unified repository'''
# '''Switch to the appropriate branch/bookmark in mozilla-unified'''
# '''Find the patch or series of patches in your local VCS.''' You can ''moz-phab patch'' onto your local machine if need be.
# '''Determine which uplift train you want to request an uplift for.''' You can see which trains are available with ''moz-phab uplift --list-trains''.
# '''Run ''moz-phab uplift --train <train> <first revision of patches to uplift> <last revision of patches to uplift>''.''' Most of the arguments to ''moz-phab uplift'' are the same as ''moz-phab submit''. This will create new revisions in Phabricator that will be uplifted to the specified train. If ''moz-phab uplift'' is run from mozilla-unified, the stack of patches will be rebased onto the target that will be landed to. For example if you specify ''--train beta'', the patches will be rebased onto the ''beta'' head in your local VCS. If ''moz-phab uplift'' is run from central or another non-unified repo, the commits will be submitted without attempting to rebase them. Note you must use ''moz-phab uplift'', not ''moz-phab sumbit'' or any other unsupported tool to submit uplift requests.
# '''Open the URL as suggested at the bottom of the output.'''
# '''Complete the uplift request form. See the section below on how to submit the form.'''


== Submit the Uplift Request Form ==
== Submit the Uplift Request Form ==
383

edits

Navigation menu