Refactor code reponsible for creating builds

This removes duplications and extracts method that builds build-jobs
without persisting those objects, to a separate method.

4 files changed, 17 insertions, 10 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index fd6fba42a34..64723ab6b4b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -66,10 +66,7 @@ module Ci
       # We use around_transition to create builds for next stage as soon as possible, before the `after_*` is executed
       around_transition any => [:success, :failed, :canceled] do |build, block|
         block.call
-        if build.commit
-          build.commit.create_next_builds(build)
-          build.commit.save
-        end
+        build.commit.create_next_builds(build) if build.commit
       end
 
       after_transition any => [:success, :failed, :canceled] do |build|
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 7e6bb4f8c1b..cdab6d5f316 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -89,13 +89,22 @@ module Ci
       trigger_requests.any?
     end
 
-    def create_builds(user, trigger_request = nil)
+    def build_builds_for_stage(stage, user, status, trigger_request)
+      CreateBuildsService.new(self).execute(stage, user, status, trigger_request)
+    end
+
+    def build_builds(user, status = 'success', trigger_request = nil)
       return unless config_processor
       config_processor.stages.any? do |stage|
-        CreateBuildsService.new(self).execute(stage, user, 'success', trigger_request).present?
+        build_builds_for_stage(stage, user, status, trigger_request).present?
       end
     end
 
+    def create_builds(user, trigger_request = nil)
+      build_builds(user, 'success', trigger_request)
+      save!
+    end
+
     def create_next_builds(build)
       return unless config_processor
 
@@ -112,9 +121,11 @@ module Ci
       prior_status = prior_builds.status
 
       # create builds for next stages based
-      next_stages.any? do |stage|
-        CreateBuildsService.new(self).execute(stage, build.user, prior_status, build.trigger_request).present?
+      have_builds = next_stages.any? do |stage|
+        build_builds_for_stage(stage, build.user, prior_status, build.trigger_request).present?
       end
+
+      save! if have_builds
     end
 
     def retried
diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb
index c611a963112..993acf11db9 100644
--- a/app/services/ci/create_trigger_request_service.rb
+++ b/app/services/ci/create_trigger_request_service.rb
@@ -15,7 +15,6 @@ module Ci
       )
 
       if ci_commit.create_builds(nil, trigger_request)
-        ci_commit.save
         trigger_request
       end
     end
diff --git a/app/services/create_commit_builds_service.rb b/app/services/create_commit_builds_service.rb
index aa0ec45be8c..dbfc93ff5bc 100644
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
@@ -25,7 +25,7 @@ class CreateCommitBuildsService
 
     # Create builds for commit and
     #   skip saving pipeline when there are no builds
-    unless commit.create_builds(user)
+    unless commit.build_builds(user)
       # Save object when there are yaml errors
       unless commit.yaml_errors.present?
         commit.errors.add(:base, 'No builds created')