Specify synapse-directory for integ tests

This commit is contained in:
Richard van der Hoff 2016-03-09 00:06:57 +00:00
parent 866d0e7cb8
commit 4814e7c9b2
2 changed files with 6 additions and 2 deletions

View File

@ -46,7 +46,9 @@ git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling b
./jenkins/prep_sytest_for_postgres.sh ./jenkins/prep_sytest_for_postgres.sh
echo >&2 "Running sytest with PostgreSQL"; 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 .. cd ..
cp sytest/.coverage.* . cp sytest/.coverage.* .

View File

@ -40,7 +40,9 @@ cd sytest
git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop) git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)
: ${PORT_BASE:=8500} : ${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 .. cd ..
cp sytest/.coverage.* . cp sytest/.coverage.* .