Use sytest build scripts, rather than reinventing the wheel

2 files changed, 7 insertions, 52 deletions

diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh
index d1fed590a2..e9f22cc04b 100755
--- a/jenkins-postgres.sh
+++ b/jenkins-postgres.sh
@@ -24,9 +24,10 @@ rm .coverage* || echo "No coverage files to remove"
 
 tox --notest
 
-: ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"}
-
 TOX_BIN=$WORKSPACE/.tox/py27/bin
+$TOX_BIN/pip install psycopg2
+
+: ${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
@@ -40,47 +41,12 @@ cd sytest
 
 git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)
 
-: ${PERL5LIB:=$WORKSPACE/perl5/lib/perl5}
-: ${PERL_MB_OPT:=--install_base=$WORKSPACE/perl5}
-: ${PERL_MM_OPT:=INSTALL_BASE=$WORKSPACE/perl5}
-export PERL5LIB PERL_MB_OPT PERL_MM_OPT
-
-./install-deps.pl
-
 : ${PORT_BASE:=8000}
 
+./jenkins/prep_sytest_for_postgres.sh
 
-if [[ -z "$POSTGRES_DB_1" ]]; then
-    echo >&2 "Variable POSTGRES_DB_1 not set"
-    exit 1
-fi
-
-if [[ -z "$POSTGRES_DB_2" ]]; then
-    echo >&2 "Variable POSTGRES_DB_2 not set"
-    exit 1
-fi
-
-mkdir -p "localhost-$(($PORT_BASE + 1))"
-mkdir -p "localhost-$(($PORT_BASE + 2))"
-
-cat > localhost-$(($PORT_BASE + 1))/database.yaml << EOF
-name: psycopg2
-args:
-    database: $POSTGRES_DB_1
-EOF
-
-cat > localhost-$(($PORT_BASE + 2))/database.yaml << EOF
-name: psycopg2
-args:
-    database: $POSTGRES_DB_2
-EOF
-
-
-# Run if both postgresql databases exist
 echo >&2 "Running sytest with PostgreSQL";
-$TOX_BIN/pip install psycopg2
-./run-tests.pl --coverage -O tap --synapse-directory $WORKSPACE \
-    --python $TOX_BIN/python --all --port-base $PORT_BASE > results-postgresql.tap
+./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
 
 cd ..
 cp sytest/.coverage.* .
diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh
index 57fd8de54d..a68f491cab 100755
--- a/jenkins-sqlite.sh
+++ b/jenkins-sqlite.sh
@@ -23,11 +23,10 @@ export PEP8SUFFIX="--output-file=violations.flake8.log || echo flake8 finished w
 rm .coverage* || echo "No coverage files to remove"
 
 tox --notest
+TOX_BIN=$WORKSPACE/.tox/py27/bin
 
 : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"}
 
-TOX_BIN=$WORKSPACE/.tox/py27/bin
-
 if [[ ! -e .sytest-base ]]; then
   git clone https://github.com/matrix-org/sytest.git .sytest-base --mirror
 else
@@ -40,18 +39,8 @@ cd sytest
 
 git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)
 
-: ${PERL5LIB:=$WORKSPACE/perl5/lib/perl5}
-: ${PERL_MB_OPT:=--install_base=$WORKSPACE/perl5}
-: ${PERL_MM_OPT:=INSTALL_BASE=$WORKSPACE/perl5}
-export PERL5LIB PERL_MB_OPT PERL_MM_OPT
-
-./install-deps.pl
-
 : ${PORT_BASE:=8500}
-
-echo >&2 "Running sytest with SQLite3";
-./run-tests.pl --coverage -O tap --synapse-directory $WORKSPACE \
-    --python $TOX_BIN/python --all --port-base $PORT_BASE > results-sqlite3.tap
+./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
 
 cd ..
 cp sytest/.coverage.* .