Merge branch 'mc/feature/manual-variables-job-retry-fixed' into 'master'

Copy manual variables when retrying job

See merge request gitlab-org/gitlab!75720

app/models/ci/build.rb

@@ -1083,6 +1083,16 @@ module Ci
       runner&.instance_type?
     end
 
+    def job_variables_attributes
+      strong_memoize(:job_variables_attributes) do
+        job_variables.internal_source.map do |variable|
+          variable.attributes.except('id', 'job_id', 'encrypted_value', 'encrypted_value_iv').tap do |attrs|
+            attrs[:value] = variable.value
+          end
+        end
+      end
+    end
+
     protected
 
     def run_status_commit_hooks!

app/services/ci/retry_build_service.rb

@@ -68,7 +68,13 @@ module Ci
     end
 
     def build_attributes(build)
-      attributes = self.class.clone_accessors.to_h do |attribute|
+      clone_attributes = if ::Feature.enabled?(:clone_job_variables_at_job_retry, build.project, default_enabled: :yaml)
+                           self.class.clone_accessors + [:job_variables_attributes]
+                         else
+                           self.class.clone_accessors
+                         end
+
+      attributes = clone_attributes.to_h do |attribute|
         [attribute, build.public_send(attribute)] # rubocop:disable GitlabSecurity/PublicSend
       end
 

config/feature_flags/development/clone_job_variables_at_job_retry.yml

+---
+name: clone_job_variables_at_job_retry
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75720
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347156
+milestone: '14.6'
+type: development
+group: group::pipeline authoring
+default_enabled: false

spec/services/ci/retry_build_service_spec.rb

@@ -73,6 +73,8 @@ RSpec.describe Ci::RetryBuildService do
              scheduled_at: 10.seconds.since)
     end
 
+    let_it_be(:internal_job_variable) { create(:ci_job_variable, job: build) }
+
     before_all do
       # Make sure that build has both `stage_id` and `stage` because FactoryBot
       # can reset one of the fields when assigning another. We plan to deprecate
@@ -86,7 +88,7 @@ RSpec.describe Ci::RetryBuildService do
                file_type: file_type, job: build, expire_at: build.artifacts_expire_at)
       end
 
-      create(:ci_job_variable, job: build)
+      create(:ci_job_variable, :dotenv_source, job: build)
       create(:ci_build_need, build: build)
       create(:terraform_state_version, build: build)
     end
@@ -125,6 +127,27 @@ RSpec.describe Ci::RetryBuildService do
         expect(new_build.needs_attributes).to match(build.needs_attributes)
         expect(new_build.needs).not_to match(build.needs)
       end
+
+      context 'when clone_job_variables_at_job_retry is enabled' do
+        before do
+          stub_feature_flags(clone_job_variables_at_job_retry: true)
+        end
+
+        it 'clones only internal job variables' do
+          expect(new_build.job_variables.count).to eq(1)
+          expect(new_build.job_variables).to contain_exactly(having_attributes(key: internal_job_variable.key, value: internal_job_variable.value))
+        end
+      end
+
+      context 'when clone_job_variables_at_job_retry is not enabled' do
+        before do
+          stub_feature_flags(clone_job_variables_at_job_retry: false)
+        end
+
+        it 'does not clone internal job variables' do
+          expect(new_build.job_variables.count).to eq(0)
+        end
+      end
     end
 
     describe 'reject accessors' do