summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-03-09 00:06:57 +0000
committerRichard van der Hoff <richard@matrix.org>2016-03-09 00:06:57 +0000
commit4814e7c9b2b9cc14d2890483747bcb1655579ec5 (patch)
tree191faee04e984704daf8ede4922fdc809781c202
parentOnly build py27 tox env for integ tests (diff)
downloadsynapse-4814e7c9b2b9cc14d2890483747bcb1655579ec5.tar.xz
Specify synapse-directory for integ tests
-rwxr-xr-xjenkins-postgres.sh4
-rwxr-xr-xjenkins-sqlite.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh
index 14e60482cd..876fabdc71 100755
--- a/jenkins-postgres.sh
+++ b/jenkins-postgres.sh
@@ -46,7 +46,9 @@ git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling b
 ./jenkins/prep_sytest_for_postgres.sh
 
 echo >&2 "Running sytest with PostgreSQL";
-./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
+./jenkins/install_and_run.sh --python $TOX_BIN/python \
+                             --synapse-directory $WORKSPACE \
+                             --port-base $PORT_BASE
 
 cd ..
 cp sytest/.coverage.* .
diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh
index 9e474aa9f6..ff6664276d 100755
--- a/jenkins-sqlite.sh
+++ b/jenkins-sqlite.sh
@@ -40,7 +40,9 @@ cd sytest
 git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)
 
 : ${PORT_BASE:=8500}
-./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
+./jenkins/install_and_run.sh --python $TOX_BIN/python \
+                             --synapse-directory $WORKSPACE \
+                             --port-base $PORT_BASE
 
 cd ..
 cp sytest/.coverage.* .