Merge branch 'expire-ci-etags-synchronously' into 'master'

Avoid extra Sidekiq jobs for expiring CI etags

See merge request gitlab-org/gitlab!78468

app/models/ci/pipeline.rb

@@ -244,11 +244,7 @@ module Ci
             ::JiraConnect::SyncBuildsWorker.perform_async(pipeline.id, seq_id)
           end
 
-          if Feature.enabled?(:expire_job_and_pipeline_cache_synchronously, pipeline.project, default_enabled: :yaml)
-            Ci::ExpirePipelineCacheService.new.execute(pipeline) # rubocop: disable CodeReuse/ServiceClass
-          else
-            ExpirePipelineCacheWorker.perform_async(pipeline.id)
-          end
+          Ci::ExpirePipelineCacheService.new.execute(pipeline) # rubocop: disable CodeReuse/ServiceClass
         end
       end
 

app/models/commit_status.rb

@@ -194,11 +194,7 @@ class CommitStatus < Ci::ApplicationRecord
       commit_status.run_after_commit do
         PipelineProcessWorker.perform_async(pipeline_id) unless transition_options[:skip_pipeline_processing]
 
-        if Feature.enabled?(:expire_job_and_pipeline_cache_synchronously, project, default_enabled: :yaml)
-          expire_etag_cache!
-        else
-          ExpireJobCacheWorker.perform_async(id)
-        end
+        expire_etag_cache!
       end
     end
 

app/services/ci/pipeline_processing/atomic_processing_service.rb

@@ -36,9 +36,7 @@ module Ci
         update_pipeline!
         update_statuses_processed!
 
-        if Feature.enabled?(:expire_job_and_pipeline_cache_synchronously, pipeline.project, default_enabled: :yaml)
-          Ci::ExpirePipelineCacheService.new.execute(pipeline)
-        end
+        Ci::ExpirePipelineCacheService.new.execute(pipeline)
 
         true
       end

config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml

----
-name: expire_job_and_pipeline_cache_synchronously
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75611
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1380
-milestone: '14.6'
-type: development
-group: group::project management
-default_enabled: false

spec/models/ci/pipeline_spec.rb

@@ -1517,30 +1517,12 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
     end
 
     describe 'pipeline caching' do
-      context 'when expire_job_and_pipeline_cache_synchronously is enabled' do
-        before do
-          stub_feature_flags(expire_job_and_pipeline_cache_synchronously: true)
-        end
-
-        it 'executes Ci::ExpirePipelineCacheService' do
-          expect_next_instance_of(Ci::ExpirePipelineCacheService) do |service|
-            expect(service).to receive(:execute).with(pipeline)
-          end
-
-          pipeline.cancel
-        end
-      end
-
-      context 'when expire_job_and_pipeline_cache_synchronously is disabled' do
-        before do
-          stub_feature_flags(expire_job_and_pipeline_cache_synchronously: false)
+      it 'executes Ci::ExpirePipelineCacheService' do
+        expect_next_instance_of(Ci::ExpirePipelineCacheService) do |service|
+          expect(service).to receive(:execute).with(pipeline)
         end
 
-        it 'performs ExpirePipelinesCacheWorker' do
-          expect(ExpirePipelineCacheWorker).to receive(:perform_async).with(pipeline.id)
-
-          pipeline.cancel
-        end
+        pipeline.cancel
       end
     end
 

spec/models/commit_status_spec.rb

@@ -46,28 +46,10 @@ RSpec.describe CommitStatus do
   describe 'status state machine' do
     let!(:commit_status) { create(:commit_status, :running, project: project) }
 
-    context 'when expire_job_and_pipeline_cache_synchronously is enabled' do
-      before do
-        stub_feature_flags(expire_job_and_pipeline_cache_synchronously: true)
-      end
-
-      it 'invalidates the cache after a transition' do
-        expect(commit_status).to receive(:expire_etag_cache!)
-
-        commit_status.success!
-      end
-    end
+    it 'invalidates the cache after a transition' do
+      expect(commit_status).to receive(:expire_etag_cache!)
 
-    context 'when expire_job_and_pipeline_cache_synchronously is disabled' do
-      before do
-        stub_feature_flags(expire_job_and_pipeline_cache_synchronously: false)
-      end
-
-      it 'invalidates the cache after a transition' do
-        expect(ExpireJobCacheWorker).to receive(:perform_async).with(commit_status.id)
-
-        commit_status.success!
-      end
+      commit_status.success!
     end
 
     describe 'transitioning to running' do