summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-10-17 10:56:55 +0100
committerSean McGivern <sean@gitlab.com>2016-10-17 10:56:55 +0100
commit86dcb79be37f5759dfeaa26283ed8bf031b38d54 (patch)
tree70869aeaa6bfbdcaada873cfd3e4054c62d3e25a /.gitlab-ci.yml
parent26e327ea93140f6400b965b845958ff50461718c (diff)
parent052de0600c6b137e6f9df08250b4cf5f38280295 (diff)
downloadgitlab-ce-86dcb79be37f5759dfeaa26283ed8bf031b38d54.tar.gz
Merge branch 'master' into merge-conflicts-editor-2
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c2edd8e9e0..76117a48730 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,7 +99,7 @@ update-knapsack:
- export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export KNAPSACK_GENERATE_REPORT=true
- cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
- - knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
+ - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
artifacts:
expire_in: 31d
paths:
@@ -309,6 +309,9 @@ coverage:
# Trigger docs build
trigger_docs:
stage: post-test
+ before_script: []
+ cache: {}
+ artifacts: {}
script:
- "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master https://gitlab.com/api/v3/projects/38069/trigger/builds"
only: