Merge branch 'ab-fix-bad-merge' into 'master'

Fix ::Ci::Minutes::UpdateBuildMinutesService called twice

See merge request gitlab-org/gitlab!66079

ee/app/workers/ee/ci/build_finished_worker.rb

@@ -4,10 +4,9 @@ module EE
   module Ci
     module BuildFinishedWorker
       def process_build(build)
-        ::Ci::Minutes::UpdateBuildMinutesService.new(build.project, nil).execute(build)
-        # We need to use `reset` on `project` because their AR associations have been cached
-        # and `Namespace#namespace_statistics` will return stale data.
-        ::Ci::Minutes::EmailNotificationService.new(build.project.reset).execute if ::Gitlab.com?
+        unless ::Feature.enabled?(:cancel_pipelines_prior_to_destroy, default_enabled: :yaml)
+          ::Ci::Minutes::UpdateBuildMinutesService.new(build.project, nil).execute(build)
+        end
 
         unless build.project.requirements.empty?
           RequirementsManagement::ProcessRequirementsReportsWorker.perform_async(build.id)

ee/spec/workers/build_finished_worker_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe BuildFinishedWorker do
-  let(:ci_runner) { create(:ci_runner) }
-  let(:build) { create(:ee_ci_build, :success, runner: ci_runner) }
-  let(:project) { build.project }
-  let(:namespace) { project.shared_runners_limit_namespace }
-
-  subject do
-    described_class.new.perform(build.id)
-  end
-
-  def namespace_stats
-    namespace.namespace_statistics || namespace.create_namespace_statistics
-  end
-
-  def project_stats
-    project.statistics || project.create_statistics(namespace: project.namespace)
-  end
-
-  describe '#perform' do
-    context 'when on .com' do
-      before do
-        allow(Gitlab).to receive(:com?).and_return(true)
-        allow_any_instance_of(EE::Project).to receive(:shared_runners_minutes_limit_enabled?).and_return(true)
-      end
-
-      context 'when cancel_pipelines_prior_to_destroy is disabled' do
-        before do
-          stub_feature_flags(cancel_pipelines_prior_to_destroy: false)
-        end
-
-        it 'updates the project stats' do
-          expect { subject }.to change { project_stats.reload.shared_runners_seconds }
-        end
-
-        it 'updates the namespace stats' do
-          expect { subject }.to change { namespace_stats.reload.shared_runners_seconds }
-        end
-
-        it 'notifies the owners of Groups' do
-          namespace.update_attribute(:shared_runners_minutes_limit, 2000)
-          namespace_stats.update_attribute(:shared_runners_seconds, 2100 * 60)
-
-          expect(CiMinutesUsageMailer).to receive(:notify).once.with(namespace, [namespace.owner.email]).and_return(spy)
-
-          subject
-        end
-      end
-    end
-
-    context 'when not on .com' do
-      before do
-        allow(Gitlab).to receive(:com?).and_return(false)
-      end
-
-      it 'does not notify the owners of Groups' do
-        expect(::Ci::Minutes::EmailNotificationService).not_to receive(:new)
-
-        subject
-      end
-    end
-
-    it 'does not schedule processing of requirement reports by default' do
-      expect(RequirementsManagement::ProcessRequirementsReportsWorker).not_to receive(:perform_async)
-
-      subject
-    end
-
-    it 'schedules processing of requirement reports if project has requirements' do
-      create(:requirement, project: project)
-
-      expect(RequirementsManagement::ProcessRequirementsReportsWorker).to receive(:perform_async)
-
-      subject
-    end
-
-    context 'when token revocation is disabled' do
-      before do
-        allow_next_instance_of(described_class) do |build_finished_worker|
-          allow(build_finished_worker).to receive(:revoke_secret_detection_token?) { false }
-        end
-      end
-
-      it 'does not scan security reports for token revocation' do
-        expect(ScanSecurityReportSecretsWorker).not_to receive(:perform_async)
-
-        subject
-      end
-    end
-  end
-end

ee/spec/workers/ee/ci/build_finished_worker_spec.rb

@@ -27,21 +27,27 @@ RSpec.describe Ci::BuildFinishedWorker do
         allow_any_instance_of(EE::Project).to receive(:shared_runners_minutes_limit_enabled?).and_return(true) # rubocop:disable RSpec/AnyInstanceOf
       end
 
-      it 'updates the project stats' do
-        expect { subject }.to change { project_stats.reload.shared_runners_seconds }
-      end
+      context 'when cancel_pipelines_prior_to_destroy is disabled' do
+        before do
+          stub_feature_flags(cancel_pipelines_prior_to_destroy: false)
+        end
 
-      it 'updates the namespace stats' do
-        expect { subject }.to change { namespace_stats.reload.shared_runners_seconds }
-      end
+        it 'updates the project stats' do
+          expect { subject }.to change { project_stats.reload.shared_runners_seconds }
+        end
 
-      it 'notifies the owners of Groups' do
-        namespace.update_attribute(:shared_runners_minutes_limit, 2000)
-        namespace_stats.update_attribute(:shared_runners_seconds, 2100 * 60)
+        it 'updates the namespace stats' do
+          expect { subject }.to change { namespace_stats.reload.shared_runners_seconds }
+        end
 
-        expect(CiMinutesUsageMailer).to receive(:notify).once.with(namespace, [namespace.owner.email]).and_return(spy)
+        it 'notifies the owners of Groups' do
+          namespace.update_attribute(:shared_runners_minutes_limit, 2000)
+          namespace_stats.update_attribute(:shared_runners_seconds, 2100 * 60)
 
-        subject
+          expect(CiMinutesUsageMailer).to receive(:notify).once.with(namespace, [namespace.owner.email]).and_return(spy)
+
+          subject
+        end
       end
     end