Add specs for pipeline process with auto-retries

This also resolve a possible race condition - a next stage should not
start until are retries are done in a previous one.

1 files changed, 4 insertions, 6 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index a1b1fbefa42..416a2a33378 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -97,13 +97,11 @@ module Ci
         end
       end
 
-      after_transition any => [:failed] do |build|
-        build.run_after_commit do
-          next if build.retries_max.zero?
+      before_transition any => [:failed] do |build|
+        next if build.retries_max.zero?
 
-          if build.retries_count < build.retries_max
-            Ci::Build.retry(build, build.user)
-          end
+        if build.retries_count < build.retries_max
+          Ci::Build.retry(build, build.user)
         end
       end
     end