summary refs log tree commit diff
path: root/jenkins-postgres.sh
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-06-24 14:03:01 +0100
committerGitHub <noreply@github.com>2016-06-24 14:03:01 +0100
commit535b6bfacc7586af97fc933ea729aa31e6991734 (patch)
tree4d2bf179bc8299178273497f7deb2ab0aabe5d73 /jenkins-postgres.sh
parentMerge branch 'master' into develop (diff)
parentFix the sytests to use a port-range rather than a port base (diff)
downloadsynapse-535b6bfacc7586af97fc933ea729aa31e6991734.tar.xz
Merge pull request #895 from matrix-org/markjh/jenkins_port_range
Fix the sytests to use a port-range rather than a port base
Diffstat (limited to 'jenkins-postgres.sh')
-rwxr-xr-xjenkins-postgres.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh
index ae6b111591..2f0768fcb7 100755
--- a/jenkins-postgres.sh
+++ b/jenkins-postgres.sh
@@ -44,6 +44,7 @@ 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
 
@@ -51,7 +52,7 @@ echo >&2 "Running sytest with PostgreSQL";
 ./jenkins/install_and_run.sh --coverage \
                              --python $TOX_BIN/python \
                              --synapse-directory $WORKSPACE \
-                             --port-base $PORT_BASE
+                             --port-range ${PORT_BASE}:$((PORT_BASE+PORT_COUNT-1)) \
 
 cd ..
 cp sytest/.coverage.* .