Confirmed users
425
edits
No edit summary |
|||
Line 80: | Line 80: | ||
## If the Travis build failed check it to see if the ''gaia_ui_tests'' step failed, and if it did whether any of the affected tests failed. Although it is preferred that no pull request be merged with a failing Travis build, if you are confident that the Travis failure had nothing to do with the changes in your pull request you may merge it, at your own discretion. | ## If the Travis build failed check it to see if the ''gaia_ui_tests'' step failed, and if it did whether any of the affected tests failed. Although it is preferred that no pull request be merged with a failing Travis build, if you are confident that the Travis failure had nothing to do with the changes in your pull request you may merge it, at your own discretion. | ||
## You may also request a rerun of the Travis build, which you do via the [https://travis-ci.org/mozilla-b2g/gaia/pull_requests Travis UI], if you would prefer to see it pass before merging. | ## You may also request a rerun of the Travis build, which you do via the [https://travis-ci.org/mozilla-b2g/gaia/pull_requests Travis UI], if you would prefer to see it pass before merging. | ||
== Finding Bugs That Require Uplifts == | |||
All bugs that require uplifts should be flagged as ''status-b2g-v1.2: affected'' (or whichever flag corresponds to the branch of interest). You can execute a Bugzilla query such as [https://bugzilla.mozilla.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=gaia-ui-test-open-v1.2-affected&sharer_id=440009&list_id=8605601 this one], to view all such bugs and then assign yourself to any that you plan to complete. | |||
== Keeping On Top of Changes == | == Keeping On Top of Changes == | ||
Line 86: | Line 90: | ||
# As mentioned above, if you can complete an uplift yourself, by creating a pull request, rather than simply flagging a bug as affected, that is preferable. | # As mentioned above, if you can complete an uplift yourself, by creating a pull request, rather than simply flagging a bug as affected, that is preferable. | ||
# Monitor bugs that are flagged as ''status-b2g-v1.2: affected'' | # Monitor bugs that are flagged as ''status-b2g-v1.2: affected'' as described in [Finding Bugs That Require Uplifts]. | ||
# Complete a manual audit of commits that have landed in master but not v1.2. This is something that should be done once or twice per month. | # Complete a manual audit of commits that have landed in master but not v1.2. This is something that should be done once or twice per month. | ||
## Generate a list of all the commits that have landed in master but not v1.2 using this command: <code>git show master ^v1.2 --no-merges -- tests/python/gaia-ui-tests</code>. | ## Generate a list of all the commits that have landed in master but not v1.2 using this command: <code>git show master ^v1.2 --no-merges -- tests/python/gaia-ui-tests</code>. |