Update the branch sheriffing documentation's guidance on flaky tests.
Bug: 1034648 Change-Id: I1a94492d59ac2a6e7718481538211c2e41be58ef Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537586 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Justin Donnelly <jdonnelly@chromium.org> Cr-Commit-Position: refs/heads/master@{#827808}
This commit is contained in:

committed by
Commit Bot

parent
b083e7d313
commit
e8d706cb34
@ -69,16 +69,23 @@ tests.
|
|||||||
|
|
||||||
### Flaky tests
|
### Flaky tests
|
||||||
|
|
||||||
You should largely ignore flaky tests for the time being unless you have
|
Flaky tests that are disabled on trunk should also be disabled on any branches
|
||||||
specific reason to believe that a flake was introduced by a cherry-pick to the
|
with frequent failures of that test. If a trunk CL lands with no change other
|
||||||
branch in question. If a test is flaky on both trunk *and* a release branch,
|
than to disable one or more tests ([example](https://crrev.com/c/2507299)) and
|
||||||
the trunk sheriffs should investigate it.
|
it has an associated bug and the release manager is cc'd on the bug, you can and
|
||||||
|
should cherrypick it to the affected branch without requesting merge approval.
|
||||||
|
|
||||||
|
On the other hand, if you believe that a flake was introduced by a cherry-pick
|
||||||
|
to the branch in question and is not flaky on trunk, you will need to create a
|
||||||
|
new CL to disable it only on the branch and go through the usual merge request
|
||||||
|
process.
|
||||||
|
|
||||||
### Landing changes
|
### Landing changes
|
||||||
|
|
||||||
When you need to land a change to a branch, you'll need to go through the same
|
When you need to land a change to a branch, you'll need to go through the same
|
||||||
merge approval process as other cherry-picks. You should feel free to ping the
|
merge approval process as other cherry-picks (see exception for flaky tests
|
||||||
relevant release TPM as listed on [chromiumdash][chromiumdash-schedule].
|
above). You should feel free to ping the relevant release TPM as listed on
|
||||||
|
[chromiumdash][chromiumdash-schedule].
|
||||||
|
|
||||||
## Tools
|
## Tools
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user