From 0f24c0d46b14c18b980754b95b78cb8606b9e406 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Fri, 7 Oct 2022 11:47:26 +0200
Subject: [PATCH 1/2] Add Sytest jobs with the asyncio reactor enabled
---
.ci/scripts/calculate_jobs.py | 15 +++++++++++++++
.github/workflows/tests.yml | 1 +
2 files changed, 16 insertions(+)
diff --git a/.ci/scripts/calculate_jobs.py b/.ci/scripts/calculate_jobs.py
index b1f604eeb0d0..c01219562227 100755
--- a/.ci/scripts/calculate_jobs.py
+++ b/.ci/scripts/calculate_jobs.py
@@ -102,11 +102,26 @@
"postgres": "multi-postgres",
"workers": "workers",
},
+ {
+ "sytest-tag": "focal",
+ "postgres": "multi-postgres",
+ "workers": "workers",
+ "reactor": "asyncio",
+ },
]
if not IS_PR:
sytest_tests.extend(
[
+ {
+ "sytest-tag": "focal",
+ "reactor": "asyncio",
+ },
+ {
+ "sytest-tag": "focal",
+ "postgres": "postgres",
+ "reactor": "asyncio",
+ },
{
"sytest-tag": "testing",
"postgres": "postgres",
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1115dcc5f395..6f3a8bb4d6ad 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -304,6 +304,7 @@ jobs:
SYTEST_BRANCH: ${{ github.head_ref }}
POSTGRES: ${{ matrix.job.postgres && 1}}
MULTI_POSTGRES: ${{ (matrix.job.postgres == 'multi-postgres') && 1}}
+ ASYNCIO_REACTOR: ${{ (matrix.job.reactor == 'asyncio') && 1 }}
WORKERS: ${{ matrix.job.workers && 1 }}
BLACKLIST: ${{ matrix.job.workers && 'synapse-blacklist-with-workers' }}
TOP: ${{ github.workspace }}
From 07ce6d854f724bd23eef53bfd05442a4c8e78f26 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Fri, 7 Oct 2022 11:51:27 +0200
Subject: [PATCH 2/2] Newsfile.
---
changelog.d/14101.misc | 1 +
1 file changed, 1 insertion(+)
create mode 100644 changelog.d/14101.misc
diff --git a/changelog.d/14101.misc b/changelog.d/14101.misc
new file mode 100644
index 000000000000..c48f40cd3876
--- /dev/null
+++ b/changelog.d/14101.misc
@@ -0,0 +1 @@
+Run the integration test suites with the asyncio reactor enabled in CI.