diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-03 11:12:47 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-03 11:12:47 +0100 |
| commit | 921f17f93810ac07fd5d15494882db78fdcf3e3c (patch) | |
| tree | bd4f29ec888a4e445654688e0f6da994be899a63 /jenkins-postgres.sh | |
| parent | E2E keys: Make federation query share code with client query (diff) | |
| parent | Factor out some of the code shared between the sytest scripts (#974) (diff) | |
| download | synapse-921f17f93810ac07fd5d15494882db78fdcf3e3c.tar.xz | |
Merge branch 'develop' into rav/refactor_device_query
Diffstat (limited to 'jenkins-postgres.sh')
| -rwxr-xr-x | jenkins-postgres.sh | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh index 2f0768fcb7..edf61a45bb 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh @@ -22,37 +22,26 @@ export PEP8SUFFIX="--output-file=violations.flake8.log || echo flake8 finished w rm .coverage* || echo "No coverage files to remove" -tox --notest -e py27 +./jenkins/prepare_synapse.sh -TOX_BIN=$WORKSPACE/.tox/py27/bin -python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install -$TOX_BIN/pip install psycopg2 -$TOX_BIN/pip install lxml - -: ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} +./jenkins/clone.sh sytest https://github.com/matrix-org/sytest.git -if [[ ! -e .sytest-base ]]; then - git clone https://github.com/matrix-org/sytest.git .sytest-base --mirror -else - (cd .sytest-base; git fetch -p) -fi +: ${PORT_BASE:=20000} +: ${PORT_COUNT=100} +export PORT_BASE +export PORT_COUNT -rm -rf sytest -git clone .sytest-base sytest --shared cd sytest -git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop) - -: ${PORT_BASE:=8000} -: ${PORT_COUNT=20} - ./jenkins/prep_sytest_for_postgres.sh echo >&2 "Running sytest with PostgreSQL"; + +TOX_BIN=$WORKSPACE/.tox/py27/bin ./jenkins/install_and_run.sh --coverage \ --python $TOX_BIN/python \ --synapse-directory $WORKSPACE \ - --port-range ${PORT_BASE}:$((PORT_BASE+PORT_COUNT-1)) \ + --port-range ${PORT_BASE}:$((PORT_BASE+PORT_COUNT-1)) cd .. cp sytest/.coverage.* . |