summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-03-14 15:43:53 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-03-14 15:43:53 +0000
commitb8a54fc002aea16bf5024c8749007a0b6f8f7141 (patch)
treee16502ad6fa2409971315fb6e40bdecdf8961852 /.gitlab-ci.yml
parentbdc1a55eded1f60900fe89591a7fb935445eaac6 (diff)
parenta61c19778180a8316321ac9ca6f84de76a6c23b3 (diff)
downloadgitlab-ce-b8a54fc002aea16bf5024c8749007a0b6f8f7141.tar.gz
Merge branch 'rs-capybara-screenshot-artifacts' into 'master'
Store capybara screenshots as build artifacts Closes #13971 See merge request !7985
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db3d25195dc..492f5ef715d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,9 +67,11 @@ stages:
- knapsack rspec "--color --format documentation"
artifacts:
expire_in: 31d
+ when: always
paths:
- - knapsack/
- coverage/
+ - knapsack/
+ - tmp/capybara/
.spinach-knapsack: &spinach-knapsack
stage: test
@@ -85,9 +87,11 @@ stages:
- knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
artifacts:
expire_in: 31d
+ when: always
paths:
- - knapsack/
- coverage/
+ - knapsack/
+ - tmp/capybara/
# Prepare and merge knapsack tests