From 3d67b8c82b0128660376f81d226c111ad3e272a7 Mon Sep 17 00:00:00 2001
From: David Robertson <david.m.robertson1@gmail.com>
Date: Tue, 10 Aug 2021 12:43:50 +0100
Subject: Move sytest worker-blacklist to ci directory
---
.buildkite/worker-blacklist | 10 ----------
.github/workflows/tests.yml | 2 +-
ci/worker-blacklist | 10 ++++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 .buildkite/worker-blacklist
create mode 100644 ci/worker-blacklist
diff --git a/.buildkite/worker-blacklist b/.buildkite/worker-blacklist
deleted file mode 100644
index 5975cb98cf..0000000000
--- a/.buildkite/worker-blacklist
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file serves as a blacklist for SyTest tests that we expect will fail in
-# Synapse when run under worker mode. For more details, see sytest-blacklist.
-
-Can re-join room if re-invited
-
-# new failures as of https://github.com/matrix-org/sytest/pull/732
-Device list doesn't change if remote server is down
-
-# https://buildkite.com/matrix-dot-org/synapse/builds/6134#6f67bf47-e234-474d-80e8-c6e1868b15c5
-Server correctly handles incoming m.device_list_update
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5349e83133..cd88184488 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -230,7 +230,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Prepare test blacklist
- run: cat sytest-blacklist .buildkite/worker-blacklist > synapse-blacklist-with-workers
+ run: cat sytest-blacklist ci/worker-blacklist > synapse-blacklist-with-workers
- name: Run SyTest
run: /bootstrap.sh synapse
working-directory: /src
diff --git a/ci/worker-blacklist b/ci/worker-blacklist
new file mode 100644
index 0000000000..5975cb98cf
--- /dev/null
+++ b/ci/worker-blacklist
@@ -0,0 +1,10 @@
+# This file serves as a blacklist for SyTest tests that we expect will fail in
+# Synapse when run under worker mode. For more details, see sytest-blacklist.
+
+Can re-join room if re-invited
+
+# new failures as of https://github.com/matrix-org/sytest/pull/732
+Device list doesn't change if remote server is down
+
+# https://buildkite.com/matrix-dot-org/synapse/builds/6134#6f67bf47-e234-474d-80e8-c6e1868b15c5
+Server correctly handles incoming m.device_list_update
--
cgit 1.5.1