From c037170faa6fcda689fdd8c3777cd9ef64c24016 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 3 Mar 2016 16:12:45 +0000
Subject: Split up jenkins tests

---
 jenkins-unittests.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 jenkins-unittests.sh

(limited to 'jenkins-unittests.sh')

diff --git a/jenkins-unittests.sh b/jenkins-unittests.sh
new file mode 100755
index 0000000000..2fa2f1b1de
--- /dev/null
+++ b/jenkins-unittests.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -eu
+
+: ${WORKSPACE:="$(pwd)"}
+
+export PYTHONDONTWRITEBYTECODE=yep
+export SYNAPSE_CACHE_FACTOR=1
+
+# Output test results as junit xml
+export TRIAL_FLAGS="--reporter=subunit"
+export TOXSUFFIX="| subunit-1to2 | subunit2junitxml --no-passthrough --output-to=results.xml"
+# Write coverage reports to a separate file for each process
+export COVERAGE_OPTS="-p"
+export DUMP_COVERAGE_COMMAND="coverage help"
+
+# Output flake8 violations to violations.flake8.log
+# Don't exit with non-0 status code on Jenkins,
+# so that the build steps continue and a later step can decided whether to
+# UNSTABLE or FAILURE this build.
+export PEP8SUFFIX="--output-file=violations.flake8.log || echo flake8 finished with status code \$?"
+
+rm .coverage* || echo "No coverage files to remove"
+
+tox -e py27
-- 
cgit 1.4.1


From 62d808beccaf4ef94e743c57b9570bea99071eb7 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-flake8.sh    | 4 +++-
 jenkins-postgres.sh  | 4 +++-
 jenkins-sqlite.sh    | 4 +++-
 jenkins-unittests.sh | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'jenkins-unittests.sh')

diff --git a/jenkins-flake8.sh b/jenkins-flake8.sh
index cbcb0ae4c0..11f1cab6c8 100755
--- a/jenkins-flake8.sh
+++ b/jenkins-flake8.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -eu
+#!/bin/bash
+
+set -eux
 
 : ${WORKSPACE:="$(pwd)"}
 
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh
index 1708cbfaaa..d1fed590a2 100755
--- a/jenkins-postgres.sh
+++ b/jenkins-postgres.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -eu
+#!/bin/bash
+
+set -eux
 
 : ${WORKSPACE:="$(pwd)"}
 
diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh
index 2d98a0af93..57fd8de54d 100755
--- a/jenkins-sqlite.sh
+++ b/jenkins-sqlite.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -eu
+#!/bin/bash
+
+set -eux
 
 : ${WORKSPACE:="$(pwd)"}
 
diff --git a/jenkins-unittests.sh b/jenkins-unittests.sh
index 2fa2f1b1de..104d511994 100755
--- a/jenkins-unittests.sh
+++ b/jenkins-unittests.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -eu
+#!/bin/bash
+
+set -eux
 
 : ${WORKSPACE:="$(pwd)"}
 
-- 
cgit 1.4.1