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

Merge branch 'retry-spinach-tests' into 'master'
121c6322 · Rémy Coutable · f34af6b8 · f9bbc4d4 · 121c6322
Commit 121c6322 authored Jun 14, 2016 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -3

No files found.
--- 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"
+    - knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
-    # retry failed tests 3 times
-    - retry '[ ! -e tmp/spinach-rerun.txt ] || bin/spinach -r rerun $(cat tmp/spinach-rerun.txt)'
  artifacts:
    paths:
    - knapsack/