diff options
| author | Paul Evans <leonerd@leonerd.org.uk> | 2017-03-01 15:08:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 15:08:09 +0000 |
| commit | 0bf2c7f3bcc9058278c1b6619a043885aa63e46b (patch) | |
| tree | 9d574d6a181d65ffa1d77dd6c0788b29991c84c3 | |
| parent | Don't log unknown cache warnings in workers (diff) | |
| parent | Added also a control script to run via the crazy dendron+haproxy hybrid we're... (diff) | |
| download | synapse-0bf2c7f3bcc9058278c1b6619a043885aa63e46b.tar.xz | |
Merge pull request #1960 from matrix-org/paul/sytest-integration
Prepare a script for Jenkins to run sytest via dendron+haproxy
| -rwxr-xr-x | jenkins-dendron-haproxy-postgres.sh | 22 | ||||
| -rwxr-xr-x | jenkins-dendron-postgres.sh | 6 |
2 files changed, 22 insertions, 6 deletions
diff --git a/jenkins-dendron-haproxy-postgres.sh b/jenkins-dendron-haproxy-postgres.sh new file mode 100755 index 0000000000..d64b2d2c9d --- /dev/null +++ b/jenkins-dendron-haproxy-postgres.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -eux + +: ${WORKSPACE:="$(pwd)"} + +export WORKSPACE +export PYTHONDONTWRITEBYTECODE=yep +export SYNAPSE_CACHE_FACTOR=1 + +export HAPROXY_BIN=/home/haproxy/haproxy-1.6.11/haproxy + +./jenkins/prepare_synapse.sh +./jenkins/clone.sh sytest https://github.com/matrix-org/sytest.git +./jenkins/clone.sh dendron https://github.com/matrix-org/dendron.git +./dendron/jenkins/build_dendron.sh +./sytest/jenkins/prep_sytest_for_postgres.sh + +./sytest/jenkins/install_and_run.sh \ + --synapse-directory $WORKSPACE \ + --dendron $WORKSPACE/dendron/bin/dendron \ + --haproxy \ diff --git a/jenkins-dendron-postgres.sh b/jenkins-dendron-postgres.sh index 55ff31fd18..37ae746f4b 100755 --- a/jenkins-dendron-postgres.sh +++ b/jenkins-dendron-postgres.sh @@ -17,9 +17,3 @@ export SYNAPSE_CACHE_FACTOR=1 ./sytest/jenkins/install_and_run.sh \ --synapse-directory $WORKSPACE \ --dendron $WORKSPACE/dendron/bin/dendron \ - --pusher \ - --synchrotron \ - --federation-reader \ - --client-reader \ - --appservice \ - --federation-sender \ |