diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-08-02 20:42:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 20:42:30 +0100 |
| commit | 9a2f296fa2e6bd42f10b12a81dba2279b8482fcc (patch) | |
| tree | ac940939078a457cdc86653b219eb936b2bc6195 /jenkins-postgres.sh | |
| parent | Merge pull request #971 from matrix-org/erikj/fed_state (diff) | |
| download | synapse-9a2f296fa2e6bd42f10b12a81dba2279b8482fcc.tar.xz | |
Factor out some of the code shared between the sytest scripts (#974)
* Factor out some of the code shared between the different sytest jenkins scripts * Exclude jenkins from the MANIFEST * Fix dendron build * Missing new line * Poke jenkins * Export the PORT_BASE and PORT_COUNT * Poke jenkins
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 7a43df0d58..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)"} - -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 - -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) +./jenkins/clone.sh sytest https://github.com/matrix-org/sytest.git : ${PORT_BASE:=20000} : ${PORT_COUNT=100} +export PORT_BASE +export PORT_COUNT + +cd sytest ./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.* . |