diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-14 07:57:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-14 07:57:44 +0000 |
| commit | 121c6322809951105d43a90e573378785b9e33a8 (patch) | |
| tree | 615e399fdfb13275fad4686cd47f424256a81230 /.gitlab-ci.yml | |
| parent | f34af6b83cc2663bb8a076f4df9c82047e5511ab (diff) | |
| parent | f9bbc4d485d32a8233894a75eae4945a2807188b (diff) | |
| download | gitlab-ce-121c6322809951105d43a90e573378785b9e33a8.tar.gz | |
Merge branch 'retry-spinach-tests' into 'master'
Retry spinach tests in case of failure using rerun reporter
## What does this MR do?
Fixes Spinach tests to retry on tests on master
See merge request !4539
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1dcf990629..83a906932d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,9 +92,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 failed tests 3 times - - retry '[ ! -e tmp/spinach-rerun.txt ] || bin/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: paths: - knapsack/ |