summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-18 23:22:34 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-18 23:22:34 +0000
commitf0ee1d515b47724a7f5a1a0d83f843f4f7200a21 (patch)
tree136ce6e6bf15081b1ae7391d0663cffc75afe6cc
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentShare sytest clone across runs (diff)
downloadsynapse-f0ee1d515b47724a7f5a1a0d83f843f4f7200a21.tar.xz
Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached
Share sytest clone across runs

Depends on https://github.com/matrix-org/synapse/pull/380
-rwxr-xr-xjenkins.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/jenkins.sh b/jenkins.sh
index 4804022e80..8d2ac63c56 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -17,14 +17,20 @@ export PEP8SUFFIX="--output-file=violations.flake8.log || echo flake8 finished w
 
 tox
 
-: ${GIT_BRANCH:="$(git rev-parse --abbrev-ref HEAD)"}
+: ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"}
 
 set +u
 . .tox/py27/bin/activate
 set -u
 
+if [[ ! -e .sytest-base ]]; then
+  git clone https://github.com/matrix-org/sytest.git .sytest-base --mirror
+else
+  (cd .sytest-base; git fetch)
+fi
+
 rm -rf sytest
-git clone https://github.com/matrix-org/sytest.git sytest
+git clone .sytest-base sytest --shared
 cd sytest
 
 git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)