OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Set --python when running sytest 

.. because I want to make the 'install_and_run' script useful for non-synapse
jobs, which do not accept --python. In any case we set up the path here, so
sytest shouldn't be guessing it.
pull/2439/head
Richard van der Hoff 2017-09-01 10:06:21 +01:00
parent 934ab76835
commit 6e67aaa7f2
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jenkins-dendron-haproxy-postgres.sh
View File

@ -17,6 +17,7 @@ export HAPROXY_BIN=/home/haproxy/haproxy-1.6.11/haproxy
./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/prep_sytest_for_postgres.sh
./sytest/jenkins/install_and_run.sh \ ./sytest/jenkins/install_and_run.sh \
--python $WORKSPACE/.tox/bin/python \
--synapse-directory $WORKSPACE \ --synapse-directory $WORKSPACE \
--dendron $WORKSPACE/dendron/bin/dendron \ --dendron $WORKSPACE/dendron/bin/dendron \
--haproxy \ --haproxy \

1
jenkins-dendron-postgres.sh
View File

@ -15,5 +15,6 @@ export SYNAPSE_CACHE_FACTOR=1
./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/prep_sytest_for_postgres.sh
./sytest/jenkins/install_and_run.sh \ ./sytest/jenkins/install_and_run.sh \
--python $WORKSPACE/.tox/bin/python \
--synapse-directory $WORKSPACE \ --synapse-directory $WORKSPACE \
--dendron $WORKSPACE/dendron/bin/dendron \ --dendron $WORKSPACE/dendron/bin/dendron \

1
jenkins-postgres.sh
View File

@ -14,4 +14,5 @@ export SYNAPSE_CACHE_FACTOR=1
./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/prep_sytest_for_postgres.sh
./sytest/jenkins/install_and_run.sh \ ./sytest/jenkins/install_and_run.sh \
--python $WORKSPACE/.tox/bin/python \
--synapse-directory $WORKSPACE \ --synapse-directory $WORKSPACE \

1
jenkins-sqlite.sh
View File

@ -12,4 +12,5 @@ export SYNAPSE_CACHE_FACTOR=1
./jenkins/clone.sh sytest https://github.com/matrix-org/sytest.git ./jenkins/clone.sh sytest https://github.com/matrix-org/sytest.git
./sytest/jenkins/install_and_run.sh \ ./sytest/jenkins/install_and_run.sh \
--python $WORKSPACE/.tox/bin/python \
--synapse-directory $WORKSPACE \ --synapse-directory $WORKSPACE \