summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-09-05 13:20:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-09-05 13:20:58 +0300
commit50fae6381d99c3fd42538fdf27715481a916cc85 (patch)
tree5dabcc171f6e5e4f40e4e2a4fa1fbc0074316663 /.gitlab-ci.yml
parent272abb337c4f60bbda3881cb5650e21632cdf2d5 (diff)
parentdd157e458ce0d76fc76e32fe2e5bcbbf945c104e (diff)
downloadgitlab-ce-50fae6381d99c3fd42538fdf27715481a916cc85.tar.gz
Merge remote-tracking branch 'ce-com/master' into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf2fcf9087a..f33f3e99abc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,6 +131,7 @@ stages:
- export KNAPSACK_GENERATE_REPORT=true
- export CACHE_CLASSES=true
- cp ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
+ - scripts/gitaly-test-spawn
- knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
artifacts:
expire_in: 31d