Up complement time outs (#13048)

matrix-org · Jun 14, 2022 · aef3984 · aef3984
1 parent bdb6628
commit aef3984
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/changelog.d/13048.misc b/changelog.d/13048.misc
@@ -0,0 +1 @@
+Increase timeout of complement CI test runs.
diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
@@ -60,6 +60,9 @@ test_tags="synapse_blacklist,msc2716,msc3030,msc3787"
 # (The prefix is stripped off before reaching the container.)
 export COMPLEMENT_SHARE_ENV_PREFIX=PASS_
 
+# It takes longer than 10m to run the whole suite.
+extra_test_args+=("-timeout=60m")
+
 if [[ -n "$WORKERS" ]]; then
   # Use workers.
   export PASS_SYNAPSE_COMPLEMENT_USE_WORKERS=true
@@ -73,9 +76,6 @@ if [[ -n "$WORKERS" ]]; then
   # time (the main problem is that we start 14 python processes for each test,
   # and complement likes to do two of them in parallel).
   export COMPLEMENT_SPAWN_HS_TIMEOUT_SECS=120
-
-  # ... and it takes longer than 10m to run the whole suite.
-  extra_test_args+=("-timeout=60m")
 else
   export PASS_SYNAPSE_COMPLEMENT_USE_WORKERS=
   if [[ -n "$POSTGRES" ]]; then