From aef398457fff33d6ac079e2665ed725397ade7f5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 14 Jun 2022 17:59:06 +0100 Subject: [PATCH] Up complement time outs (#13048) --- changelog.d/13048.misc | 1 + scripts-dev/complement.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/13048.misc diff --git a/changelog.d/13048.misc b/changelog.d/13048.misc new file mode 100644 index 0000000000..073c8b1a96 --- /dev/null +++ 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 index 30b974b954..52ef1fd07f 100755 --- 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