Remove ci_new_expire_job_artifacts_service feature flag

This commit removes ci_new_expire_job_artifacts_service feature
flag.

app/workers/expire_build_artifacts_worker.rb

@@ -7,25 +7,6 @@ class ExpireBuildArtifactsWorker
   feature_category :continuous_integration
 
   def perform
-    if Feature.enabled?(:ci_new_expire_job_artifacts_service, default_enabled: true)
-      perform_efficient_artifacts_removal
-    else
-      perform_legacy_artifacts_removal
-    end
-  end
-
-  def perform_efficient_artifacts_removal
     Ci::DestroyExpiredJobArtifactsService.new.execute
   end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def perform_legacy_artifacts_removal
-    Rails.logger.info 'Scheduling removal of build artifacts' # rubocop:disable Gitlab/RailsLogger
-
-    build_ids = Ci::Build.with_expired_artifacts.pluck(:id)
-    build_ids = build_ids.map { |build_id| [build_id] }
-
-    ExpireBuildInstanceArtifactsWorker.bulk_perform_async(build_ids)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
 end

spec/workers/expire_build_artifacts_worker_spec.rb

@@ -3,62 +3,11 @@
 require 'spec_helper'
 
 describe ExpireBuildArtifactsWorker do
-  include RepoHelpers
-
   let(:worker) { described_class.new }
 
-  before do
-    Sidekiq::Worker.clear_all
-  end
-
   describe '#perform' do
-    before do
-      stub_feature_flags(ci_new_expire_job_artifacts_service: false)
-      build
-    end
-
-    subject! do
-      Sidekiq::Testing.fake! { worker.perform }
-    end
-
-    context 'with expired artifacts' do
-      let(:build) { create(:ci_build, :artifacts, artifacts_expire_at: Time.now - 7.days) }
-
-      it 'enqueues that build' do
-        expect(jobs_enqueued.size).to eq(1)
-        expect(jobs_enqueued[0]["args"]).to eq([build.id])
-      end
-    end
-
-    context 'with not yet expired artifacts' do
-      let(:build) { create(:ci_build, :artifacts, artifacts_expire_at: Time.now + 7.days) }
-
-      it 'does not enqueue that build' do
-        expect(jobs_enqueued.size).to eq(0)
-      end
-    end
-
-    context 'without expire date' do
-      let(:build) { create(:ci_build, :artifacts) }
-
-      it 'does not enqueue that build' do
-        expect(jobs_enqueued.size).to eq(0)
-      end
-    end
-
-    def jobs_enqueued
-      Sidekiq::Queues.jobs_by_worker['ExpireBuildInstanceArtifactsWorker']
-    end
-  end
-
-  describe '#perform with ci_new_expire_job_artifacts_service feature flag' do
-    before do
-      stub_feature_flags(ci_new_expire_job_artifacts_service: true)
-    end
-
     it 'executes a service' do
       expect_any_instance_of(Ci::DestroyExpiredJobArtifactsService).to receive(:execute)
-      expect(ExpireBuildInstanceArtifactsWorker).not_to receive(:bulk_perform_async)
 
       worker.perform
     end