From 9101193242c59a9b56f550be05509c76e87b3bca Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Thu, 28 Jan 2016 14:18:45 +0000
Subject: Quot all the things

---
 jenkins.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'jenkins.sh')

diff --git a/jenkins.sh b/jenkins.sh
index e2bb706c7f..804bbd49f1 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -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 \
-- 
cgit 1.4.1


From 49c328a8927a913c4905f0c136fc6ce90e361b6e Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Thu, 28 Jan 2016 14:57:40 +0000
Subject: Prune on fetching

So we don't try to checkout a stale ref
---
 jenkins.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jenkins.sh')

diff --git a/jenkins.sh b/jenkins.sh
index 804bbd49f1..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
-- 
cgit 1.4.1


From f1dd03548f31be2e65e9c37550b5456f4510d52c Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Tue, 23 Feb 2016 15:15:10 +0000
Subject: Set WORKSPACE if not set

---
 jenkins.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'jenkins.sh')

diff --git a/jenkins.sh b/jenkins.sh
index ed3bdf80fa..359fd22771 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -eu
 
+: ${WORKSPACE:="$(pwd)"}
+
 export PYTHONDONTWRITEBYTECODE=yep
 
 # Output test results as junit xml
-- 
cgit 1.4.1


From 27185de75255191dcc9bf30b1bde9b6fc9a27100 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 2 Mar 2016 14:30:50 +0000
Subject: Set SYNAPSE_CACHE_FACTOR=1 in jenkins

---
 jenkins.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jenkins.sh')

diff --git a/jenkins.sh b/jenkins.sh
index 359fd22771..9646ac0b01 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -3,6 +3,7 @@
 : ${WORKSPACE:="$(pwd)"}
 
 export PYTHONDONTWRITEBYTECODE=yep
+export SYNAPSE_CACHE_FACTOR=1
 
 # Output test results as junit xml
 export TRIAL_FLAGS="--reporter=subunit"
-- 
cgit 1.4.1


From b139e510412430cb7decd58a098871f7ded9ef0c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 3 Mar 2016 11:38:36 +0000
Subject: jenkins.sh: set -x

Also move the options from the shebang line to the body of the script, so that
they take effect even if somebody explicitly runs "bash jenkins.sh"
---
 jenkins.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'jenkins.sh')

diff --git a/jenkins.sh b/jenkins.sh
index 9646ac0b01..b826d510c9 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -eu
+#!/bin/bash
+
+set -eux
 
 : ${WORKSPACE:="$(pwd)"}
 
-- 
cgit 1.4.1