Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Move Complement test matrix jobs definition to match Sytest and Trial. #14153

Closed
wants to merge 20 commits into from
Closed

Move Complement test matrix jobs definition to match Sytest and Trial. #14153

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d7192cd
Duplicate worker types defined in start_for_complement.sh into calcul…
realtyem Oct 12, 2022
5847f41
Modify tests.yml to use the new job matrix.
realtyem Oct 12, 2022
db446cc
Pass the SYNAPSE_WORKER_TYPES through to the Complement tests.
realtyem Oct 12, 2022
560e28c
Strip out the now unneeded part of start_for_complement.sh.
realtyem Oct 12, 2022
84399a3
Changelog.
realtyem Oct 12, 2022
2f9f79b
Merge branch 'develop' into realtyem/complement-move-workers-def-to-o…
realtyem Oct 12, 2022
6be11b6
Adjust for PR #14028 being merged.
realtyem Oct 12, 2022
a246dda
Fix executable permission on start_for_complement.sh.
realtyem Oct 12, 2022
01992aa
Don't actually need to put the SYNAPSE_ prefix on env variables.
realtyem Oct 12, 2022
785cf2e
Update docs and include example.
realtyem Oct 12, 2022
a4306d1
Merge branch 'develop' into realtyem/complement-move-workers-def-to-o…
realtyem Oct 12, 2022
a5de665
Merge branch 'develop' into realtyem/complement-move-workers-def-to-o…
realtyem Oct 16, 2022
079c5d9
Create backwards compatibility use for WORKERS=1 in start_for_complem…
realtyem Oct 16, 2022
7528511
[REVERT THIS] Create quick test to make sure it all works as intended.
realtyem Oct 16, 2022
6846a1c
How did those get in there?
realtyem Oct 17, 2022
80afb8a
Update to docs.
realtyem Oct 17, 2022
eca4595
Merge branch 'develop' into realtyem/complement-move-workers-def-to-o…
realtyem Oct 21, 2022
b16d4b3
It's an underscore, not a hyphen
realtyem Oct 21, 2022
6c8675c
Seriously? Editing on Github directly changes the executable permissi…
realtyem Oct 21, 2022
720f55e
Merge branch 'develop' into realtyem/complement-move-workers-def-to-o…
realtyem Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions docker/complement/conf/start_for_complement.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ set -e

echo "Complement Synapse launcher"
echo " Args: $@"
echo " Env: SYNAPSE_COMPLEMENT_DATABASE=$SYNAPSE_COMPLEMENT_DATABASE SYNAPSE_COMPLEMENT_USE_WORKERS=$SYNAPSE_COMPLEMENT_USE_WORKERS"
echo " Env: SYNAPSE_COMPLEMENT_DATABASE=$SYNAPSE_COMPLEMENT_DATABASE"
echo " Env: SYNAPSE_COMPLEMENT_USE_WORKERS=$SYNAPSE_COMPLEMENT_USE_WORKERS"
echo " Env: SYNAPSE_WORKER_TYPES=$SYNAPSE_WORKER_TYPES"

function log {
d=$(date +"%Y-%m-%d %H:%M:%S,%3N")
Expand Down Expand Up @@ -44,27 +46,8 @@ esac


if [[ -n "$SYNAPSE_COMPLEMENT_USE_WORKERS" ]]; then
# Specify the workers to test with
realtyem marked this conversation as resolved.
Show resolved Hide resolved
export SYNAPSE_WORKER_TYPES="\
event_persister, \
event_persister, \
background_worker, \
frontend_proxy, \
event_creator, \
user_dir, \
media_repository, \
federation_inbound, \
federation_reader, \
federation_sender, \
synchrotron, \
appservice, \
pusher"

# Improve startup times by using a launcher based on fork()
export SYNAPSE_USE_EXPERIMENTAL_FORKING_LAUNCHER=1
else
# Empty string here means 'main process only'
export SYNAPSE_WORKER_TYPES=""
fi


Expand Down