1 files changed, 36 insertions, 2 deletions

diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb
index ebb07de9d29..89fe4ff9f60 100644
--- a/app/services/ci/retry_build_service.rb
+++ b/app/services/ci/retry_build_service.rb
@@ -2,12 +2,14 @@
 
 module Ci
   class RetryBuildService < ::BaseService
+    include Gitlab::Utils::StrongMemoize
+
     def self.clone_accessors
       %i[pipeline project ref tag options name
          allow_failure stage stage_id stage_idx trigger_request
          yaml_variables when environment coverage_regex
          description tag_list protected needs_attributes
-         resource_group scheduling_type].freeze
+         job_variables_attributes resource_group scheduling_type].freeze
     end
 
     def self.extra_accessors
@@ -45,6 +47,11 @@ module Ci
           job.save!
         end
       end
+
+      if create_deployment_in_separate_transaction?
+        clone_deployment!(new_build, build)
+      end
+
       build.reset # refresh the data to get new values of `retried` and `processed`.
 
       new_build
@@ -63,7 +70,9 @@ module Ci
 
     def clone_build(build)
       project.builds.new(build_attributes(build)).tap do |new_build|
-        new_build.assign_attributes(deployment_attributes_for(new_build, build))
+        unless create_deployment_in_separate_transaction?
+          new_build.assign_attributes(deployment_attributes_for(new_build, build))
+        end
       end
     end
 
@@ -72,6 +81,11 @@ module Ci
         [attribute, build.public_send(attribute)] # rubocop:disable GitlabSecurity/PublicSend
       end
 
+      if create_deployment_in_separate_transaction? && build.persisted_environment.present?
+        attributes[:metadata_attributes] ||= {}
+        attributes[:metadata_attributes][:expanded_environment_name] = build.expanded_environment_name
+      end
+
       attributes[:user] = current_user
       attributes
     end
@@ -80,6 +94,26 @@ module Ci
       ::Gitlab::Ci::Pipeline::Seed::Build
         .deployment_attributes_for(new_build, old_build.persisted_environment)
     end
+
+    def clone_deployment!(new_build, old_build)
+      return unless old_build.deployment.present?
+
+      # We should clone the previous deployment attributes instead of initializing
+      # new object with `Seed::Deployment`.
+      # See https://gitlab.com/gitlab-org/gitlab/-/issues/347206
+      deployment = ::Gitlab::Ci::Pipeline::Seed::Deployment
+        .new(new_build, old_build.persisted_environment).to_resource
+
+      return unless deployment
+
+      new_build.create_deployment!(deployment.attributes)
+    end
+
+    def create_deployment_in_separate_transaction?
+      strong_memoize(:create_deployment_in_separate_transaction) do
+        ::Feature.enabled?(:create_deployment_in_separate_transaction, project, default_enabled: :yaml)
+      end
+    end
   end
 end