Merge branch 'alberts-move-ff-ci_job_artifacts_backlog_large_loop_limit-to-ops' into 'master'

Move feature flag to ops type

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136030



Merged-by: Erick Bajao <fbajao@gitlab.com>
Approved-by: Erick Bajao <fbajao@gitlab.com>
Co-authored-by: Albert Salim <asalim@gitlab.com>

app/services/ci/job_artifacts/update_unknown_locked_status_service.rb

@@ -17,7 +17,11 @@ def initialize
         @removed_count = 0
         @locked_count = 0
         @start_at = Time.current
-        @loop_limit = Feature.enabled?(:ci_job_artifacts_backlog_large_loop_limit) ? LARGE_LOOP_LIMIT : LOOP_LIMIT
+        @loop_limit = if Feature.enabled?(:ci_job_artifacts_backlog_large_loop_limit, type: :ops)
+                        LARGE_LOOP_LIMIT
+                      else
+                        LOOP_LIMIT
+                      end
       end
 
       def execute
@@ -35,9 +39,9 @@ def update_locked_status_on_unknown_artifacts
           unknown_status_build_ids = safely_ordered_ci_job_artifacts_locked_unknown_relation.pluck_job_id.uniq
 
           locked_pipe_build_ids = ::Ci::Build
-            .with_pipeline_locked_artifacts
-            .id_in(unknown_status_build_ids)
-            .pluck_primary_key
+                                    .with_pipeline_locked_artifacts
+                                    .id_in(unknown_status_build_ids)
+                                    .pluck_primary_key
 
           @locked_count += update_unknown_artifacts(locked_pipe_build_ids, Ci::JobArtifact.lockeds[:artifacts_locked])
 

config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml → config/feature_flags/ops/ci_job_artifacts_backlog_large_loop_limit.yml

@@ -3,6 +3,6 @@ name: ci_job_artifacts_backlog_large_loop_limit
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76509
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347151
 milestone: '14.10'
-type: development
+type: ops
 group: group::pipeline security
 default_enabled: false

spec/services/ci/job_artifacts/update_unknown_locked_status_service_spec.rb

@@ -87,19 +87,39 @@
       end
 
       context 'due to @loop_limit' do
-        before do
-          stub_const("#{described_class}::LARGE_LOOP_LIMIT", 1)
-        end
+        context 'when feature flag ci_job_artifacts_backlog_large_loop_limit is enabled' do
+          before do
+            stub_const("#{described_class}::LARGE_LOOP_LIMIT", 1)
+          end
 
-        it 'affects the most recently expired artifact first' do
-          subject
+          it 'affects the most recently expired artifact first' do
+            subject
 
-          expect(unknown_locked_artifact.reload.locked).to eq('artifacts_locked')
-          expect(unknown_unlocked_artifact.reload.locked).to eq('unknown')
+            expect(unknown_locked_artifact.reload.locked).to eq('artifacts_locked')
+            expect(unknown_unlocked_artifact.reload.locked).to eq('unknown')
+          end
+
+          it 'reports the number of destroyed artifacts' do
+            is_expected.to eq({ removed: 0, locked: 1 })
+          end
         end
 
-        it 'reports the number of destroyed artifacts' do
-          is_expected.to eq({ removed: 0, locked: 1 })
+        context 'when feature flag ci_job_artifacts_backlog_large_loop_limit is disabled' do
+          before do
+            stub_feature_flags(ci_job_artifacts_backlog_large_loop_limit: false)
+            stub_const("#{described_class}::LOOP_LIMIT", 1)
+          end
+
+          it 'affects the most recently expired artifact first' do
+            subject
+
+            expect(unknown_locked_artifact.reload.locked).to eq('artifacts_locked')
+            expect(unknown_unlocked_artifact.reload.locked).to eq('unknown')
+          end
+
+          it 'reports the number of destroyed artifacts' do
+            is_expected.to eq({ removed: 0, locked: 1 })
+          end
         end
       end
     end