Confirmed users
571
edits
Sheriffing/How To/Merges: Difference between revisions
add instructions to request missing tasks to get merge candidate if no merge since last Nightly builds
m (updated the merge candidate selection criteria) |
(add instructions to request missing tasks to get merge candidate if no merge since last Nightly builds) |
||
| (5 intermediate revisions by 2 users not shown) | |||
| Line 8: | Line 8: | ||
'''A more in depth view of the conditions a merge candidate must fulfill:''' | '''A more in depth view of the conditions a merge candidate must fulfill:''' | ||
#Candidate revision must be <span style="color:#14866d">'''100% completed'''</span> or <span style="color:#14866d">'''at least 98-99%'''</span>, with <span style="color:#14866d">'''maximum 15 jobs running'''</span>. The candidate revision will have the Windows | #Candidate revision must be <span style="color:#14866d">'''100% completed'''</span> or <span style="color:#14866d">'''at least 98-99%'''</span>, with <span style="color:#14866d">'''maximum 15 jobs running'''</span>. The candidate revision will have the Windows 10 Shippable opt suite and the complete Windows 10 opt suite. | ||
#<span style="color:#FF0000">'''No jobs classified as fixed by commit'''</span> | #<span style="color:#FF0000">'''No jobs classified as fixed by commit'''</span> | ||
#'''Few''' or '''no unclassified''' jobs | #'''Few''' or '''no unclassified''' jobs | ||
#Windows | #Windows 10 '''Shippable''' platform and Windows 10 '''opt''' must have <span style="color:#14866d">'''all jobs finished'''</span> (see screenshot as an example) | ||
[[File:Win10.png|center|windows 10]] | |||
#No backouts after merge candidate | #No backouts after merge candidate | ||
#If a merge candidate has more than 15 jobs running but they are autophone jobs, the candidate is good to use | #If a merge candidate has more than 15 jobs running but they are autophone jobs, the candidate is good to use | ||
If the planned merge is scheduled directly before Nightly builds will run on mozilla-central and there is no merge candidate and there hasn't been a merge to mozilla-central since the last Nightly builds ran, check if requesting all missing tasks for an autoland push has a good chance to turn it into a merge candidate. If that applies, request the missing tasks from the push's menu. | |||
Onboarding code sheriffs shall let the merge candidate they identified get checked by another sheriff. | |||
= Order of operations = | = Order of operations = | ||
| Line 36: | Line 41: | ||
[[File:Bugherder tool.png|frame|center]] | [[File:Bugherder tool.png|frame|center]] | ||
Navigate through all the pages, check for any security bugs that can’t be updated by Bugherder and mention them to someone who can, check that Resolve and Fixed checkboxes are ticked and the correct version is set. At the last step click '''Submit''' and use your '''API key''' to finish the process. Leave the tab opened until the loadbar is not displayed anymore. | Navigate through all the pages, check for any security bugs that can’t be updated by Bugherder and mention them to someone who can, check that Resolve and Fixed checkboxes are ticked and the correct version is set. At the last step click '''Submit''' and use your '''API key''' to finish the process. Leave the tab opened until the loadbar is not displayed anymore. | ||
Announce in the sheriffing chat if there are bugs shown as restricted by Bugherder because the tool cannot access it and they need to be updated manually. Some of these bugs are also not accessible to code sheriffs. | |||
<span style="color:#14866d">'''Monitor the pushes and check that the Gecko Decision Task opt job is running. If it fails, rerun it, if it fails again the tree should be closed and the issue escalated.'''</span> | <span style="color:#14866d">'''Monitor the pushes and check that the Gecko Decision Task opt job is running. If it fails, rerun it, if it fails again the tree should be closed and the issue escalated.'''</span> | ||