summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-02 13:41:17 +0100
committerErik Johnston <erik@matrix.org>2016-08-02 13:41:17 +0100
commit55e8a8788895b0c6b6b5a27d153f6d9e7e21d68b (patch)
tree1b04f9387a37a8f787c35a16398c19d22d5cc1b5
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader (diff)
downloadsynapse-55e8a8788895b0c6b6b5a27d153f6d9e7e21d68b.tar.xz
Change default jenkins port base and count
-rwxr-xr-xjenkins-dendron-postgres.sh4
-rwxr-xr-xjenkins-postgres.sh4
-rwxr-xr-xjenkins-sqlite.sh5
3 files changed, 7 insertions, 6 deletions
diff --git a/jenkins-dendron-postgres.sh b/jenkins-dendron-postgres.sh

index 9e3b2df9cf..f715cd559a 100755 --- a/jenkins-dendron-postgres.sh +++ b/jenkins-dendron-postgres.sh
@@ -69,8 +69,8 @@ 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} +: ${PORT_BASE:=20000} +: ${PORT_COUNT=100} ./jenkins/prep_sytest_for_postgres.sh diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh
index 2f0768fcb7..7a43df0d58 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh
@@ -43,8 +43,8 @@ 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} +: ${PORT_BASE:=20000} +: ${PORT_COUNT=100} ./jenkins/prep_sytest_for_postgres.sh diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh
index da603c5af8..27e61af6ee 100755 --- a/jenkins-sqlite.sh +++ b/jenkins-sqlite.sh
@@ -41,8 +41,9 @@ cd sytest git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop) -: ${PORT_COUNT=20} -: ${PORT_BASE:=8000} +: ${PORT_BASE:=20000} +: ${PORT_COUNT=100} + ./jenkins/install_and_run.sh --coverage \ --python $TOX_BIN/python \ --synapse-directory $WORKSPACE \