diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:52:06 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:52:06 +0000 |
| commit | 907c1faf1e4655659d9a9db1615e911640b9f383 (patch) | |
| tree | e9f18d4f3044cab76ab5ae119505ea651194db5e /jenkins.sh | |
| parent | Merge pull request #476 from koobs/patch-1 (diff) | |
| parent | Update CHANGES (diff) | |
| download | synapse-907c1faf1e4655659d9a9db1615e911640b9f383.tar.xz | |
Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse v0.13.0
Diffstat (limited to '')
| -rwxr-xr-x | jenkins.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jenkins.sh b/jenkins.sh index e2bb706c7f..ed3bdf80fa 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -26,7 +26,7 @@ TOX_BIN=$WORKSPACE/.tox/py27/bin if [[ ! -e .sytest-base ]]; then git clone https://github.com/matrix-org/sytest.git .sytest-base --mirror else - (cd .sytest-base; git fetch) + (cd .sytest-base; git fetch -p) fi rm -rf sytest @@ -52,7 +52,7 @@ RUN_POSTGRES="" for port in $(($PORT_BASE + 1)) $(($PORT_BASE + 2)); do if psql synapse_jenkins_$port <<< ""; then - RUN_POSTGRES=$RUN_POSTGRES:$port + RUN_POSTGRES="$RUN_POSTGRES:$port" cat > localhost-$port/database.yaml << EOF name: psycopg2 args: @@ -62,7 +62,7 @@ EOF done # Run if both postgresql databases exist -if test $RUN_POSTGRES = ":$(($PORT_BASE + 1)):$(($PORT_BASE + 2))"; then +if test "$RUN_POSTGRES" = ":$(($PORT_BASE + 1)):$(($PORT_BASE + 2))"; then echo >&2 "Running sytest with PostgreSQL"; $TOX_BIN/pip install psycopg2 ./run-tests.pl --coverage -O tap --synapse-directory $WORKSPACE \ |