diff options
| author | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
| commit | b5feaa5a494e7f3fb1a0607002df54e4f17d20da (patch) | |
| tree | eae4a91e78c9215631fde08c69c4b2dd093c44e6 /jenkins | |
| parent | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache (diff) | |
| parent | Fix overzealous kicking of guest users (#2453) (diff) | |
| download | synapse-b5feaa5a494e7f3fb1a0607002df54e4f17d20da.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
Diffstat (limited to '')
| -rwxr-xr-x | jenkins-dendron-haproxy-postgres.sh | 1 | ||||
| -rwxr-xr-x | jenkins-dendron-postgres.sh | 1 | ||||
| -rwxr-xr-x | jenkins-postgres.sh | 1 | ||||
| -rwxr-xr-x | jenkins-sqlite.sh | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/jenkins-dendron-haproxy-postgres.sh b/jenkins-dendron-haproxy-postgres.sh index d64b2d2c9d..07979bf8b8 100755 --- a/jenkins-dendron-haproxy-postgres.sh +++ b/jenkins-dendron-haproxy-postgres.sh @@ -17,6 +17,7 @@ export HAPROXY_BIN=/home/haproxy/haproxy-1.6.11/haproxy ./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/install_and_run.sh \ + --python $WORKSPACE/.tox/py27/bin/python \ --synapse-directory $WORKSPACE \ --dendron $WORKSPACE/dendron/bin/dendron \ --haproxy \ diff --git a/jenkins-dendron-postgres.sh b/jenkins-dendron-postgres.sh index 37ae746f4b..3b932fe340 100755 --- a/jenkins-dendron-postgres.sh +++ b/jenkins-dendron-postgres.sh @@ -15,5 +15,6 @@ export SYNAPSE_CACHE_FACTOR=1 ./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/install_and_run.sh \ + --python $WORKSPACE/.tox/py27/bin/python \ --synapse-directory $WORKSPACE \ --dendron $WORKSPACE/dendron/bin/dendron \ diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh index f2ca8ccdff..1afb736394 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh @@ -14,4 +14,5 @@ export SYNAPSE_CACHE_FACTOR=1 ./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/install_and_run.sh \ + --python $WORKSPACE/.tox/py27/bin/python \ --synapse-directory $WORKSPACE \ diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh index 84613d979c..baf4713a01 100755 --- a/jenkins-sqlite.sh +++ b/jenkins-sqlite.sh @@ -12,4 +12,5 @@ export SYNAPSE_CACHE_FACTOR=1 ./jenkins/clone.sh sytest https://github.com/matrix-org/sytest.git ./sytest/jenkins/install_and_run.sh \ + --python $WORKSPACE/.tox/py27/bin/python \ --synapse-directory $WORKSPACE \ |