Confirmed users
425
edits
No edit summary |
No edit summary |
||
| Line 95: | Line 95: | ||
# If this was a merge to master, consider whether the patch should be uplifted. Follow the procedure in [https://wiki.mozilla.org/QA/Execution/Web_Testing/Automation/Gaia_UI_Testing#After_Changes_Have_Been_Committed_To_Master After Changes Have Been Committed To Master]. | # If this was a merge to master, consider whether the patch should be uplifted. Follow the procedure in [https://wiki.mozilla.org/QA/Execution/Web_Testing/Automation/Gaia_UI_Testing#After_Changes_Have_Been_Committed_To_Master After Changes Have Been Committed To Master]. | ||
# If the bug is finished (e.g., no uplifts are needed), mark it as Resolved - Fixed. | # If the bug is finished (e.g., no uplifts are needed), mark it as Resolved - Fixed. | ||
= Dealing with Travis and TBPL Failures = | = Dealing with Travis and TBPL Failures = | ||
| Line 107: | Line 103: | ||
* [https://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/latest-mozilla-central/ Master] | * [https://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/latest-mozilla-central/ Master] | ||
* [https://ftp.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ v1.2] - look for the ones prefixed with mozilla-b2g26_v1_2, e.g. [https://ftp.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/mozilla-b2g26_v1_2-macosx64_gecko/ mozilla-b2g26_v1_2-macosx64_gecko] | * [https://ftp.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ v1.2] - look for the ones prefixed with mozilla-b2g26_v1_2, e.g. [https://ftp.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/mozilla-b2g26_v1_2-macosx64_gecko/ mozilla-b2g26_v1_2-macosx64_gecko] | ||
= Keeping Branches in Sync with Master = | |||
Currently, all development of Gaia UI tests is done on the master branch, with the exception of fixes that are needed specifically for a different branch. It is our goal to keep other branches of interest as closely synced with master as possible. When changes are committed to master, it is important to determine whether those changes should also be uplifted to other branches, and if so then the uplift must be completed. | |||
== Current Branches of Interest == | == Current Branches of Interest == | ||