Merge pull request #5740 from matrix-org/erikj/worker_flakey_tests

2 files changed, 8 insertions, 1 deletions

diff --git a/.buildkite/worker-blacklist b/.buildkite/worker-blacklist

index a211ed7b18..8ed8eef1a3 100644
--- a/.buildkite/worker-blacklist
+++ b/.buildkite/worker-blacklist
@@ -25,4 +25,10 @@ Members from the gap are included in gappy incr LL sync
 
 Leaves are present in non-gapped incremental syncs
 
-Old leaves are present in gapped incremental syncs
\ No newline at end of file
+Old leaves are present in gapped incremental syncs
+
+User sees updates to presence from other users in the incremental sync.
+
+Gapped incremental syncs include all state changes
+
+Old members are included in gappy incr LL sync if they start speaking
diff --git a/changelog.d/5740.misc b/changelog.d/5740.misc
new file mode 100644

index 0000000000..97a476bef5
--- /dev/null
+++ b/changelog.d/5740.misc
@@ -0,0 +1 @@
+Blacklist some flakey tests in worker mode.