Merge branch '340583-ci-drop-disabled-builds' into 'master'

Check project settings when assigning a build to a runner

See merge request gitlab-org/gitlab!70581

app/models/concerns/enums/ci/commit_status.rb

@@ -26,6 +26,7 @@ module Enums
           pipeline_loop_detected: 17,
           no_matching_runner: 18, # not used anymore, but cannot be deleted because of old data
           trace_size_exceeded: 19,
+          builds_disabled: 20,
           insufficient_bridge_permissions: 1_001,
           downstream_bridge_project_not_found: 1_002,
           invalid_bridge_trigger: 1_003,

app/presenters/commit_status_presenter.rb

@@ -27,7 +27,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     user_blocked: 'The user who created this job is blocked',
     ci_quota_exceeded: 'No more CI minutes available',
     no_matching_runner: 'No matching runner available',
-    trace_size_exceeded: 'The job log size limit was reached'
+    trace_size_exceeded: 'The job log size limit was reached',
+    builds_disabled: 'The CI/CD is disabled for this project'
   }.freeze
 
   private_constant :CALLOUT_FAILURE_MESSAGES

app/services/ci/register_job_service.rb

@@ -271,6 +271,15 @@ module Ci
         missing_dependency_failure: -> (build, _) { !build.has_valid_build_dependencies? },
         runner_unsupported: -> (build, params) { !build.supported_runner?(params.dig(:info, :features)) },
         archived_failure: -> (build, _) { build.archived? }
+      }.merge(builds_enabled_checks)
+    end
+
+    def builds_enabled_checks
+      return {} unless ::Feature.enabled?(:ci_queueing_builds_enabled_checks, runner, default_enabled: :yaml)
+
+      {
+        project_deleted: -> (build, _) { build.project.pending_delete? },
+        builds_disabled: -> (build, _) { !build.project.builds_enabled? }
       }
     end
   end

config/feature_flags/development/ci_queueing_builds_enabled_checks.yml

+---
+name: ci_queueing_builds_enabled_checks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70581
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341131
+milestone: '14.4'
+type: development
+group: group::pipeline execution
+default_enabled: false

lib/gitlab/ci/status/build/failed.rb

@@ -32,7 +32,8 @@ module Gitlab
             user_blocked: 'pipeline user was blocked',
             ci_quota_exceeded: 'no more CI minutes available',
             no_matching_runner: 'no matching runner available',
-            trace_size_exceeded: 'log size limit exceeded'
+            trace_size_exceeded: 'log size limit exceeded',
+            builds_disabled: 'project builds are disabled'
           }.freeze
 
           private_constant :REASONS

spec/services/ci/register_job_service_spec.rb

@@ -87,14 +87,32 @@ module Ci
           end
 
           context 'for specific runner' do
+            context 'with FF disabled' do
               before do
-              stub_feature_flags(ci_pending_builds_project_runners_decoupling: false)
+                stub_feature_flags(
+                  ci_pending_builds_project_runners_decoupling: false,
+                  ci_queueing_builds_enabled_checks: false)
               end
 
               it 'does not pick a build' do
                 expect(execute(specific_runner)).to be_nil
               end
             end
+
+            context 'with FF enabled' do
+              before do
+                stub_feature_flags(
+                  ci_pending_builds_project_runners_decoupling: true,
+                  ci_queueing_builds_enabled_checks: true)
+              end
+
+              it 'does not pick a build' do
+                expect(execute(specific_runner)).to be_nil
+                expect(pending_job.reload).to be_failed
+                expect(pending_job.queuing_entry).to be_nil
+              end
+            end
+          end
         end
 
         context 'allow shared runners' do
@@ -246,14 +264,32 @@ module Ci
           end
 
           context 'and uses project runner' do
+            let(:build) { execute(specific_runner) }
+
+            context 'with FF disabled' do
               before do
-              stub_feature_flags(ci_pending_builds_project_runners_decoupling: false)
+                stub_feature_flags(
+                  ci_pending_builds_project_runners_decoupling: false,
+                  ci_queueing_builds_enabled_checks: false)
               end
 
-            let(:build) { execute(specific_runner) }
-
               it { expect(build).to be_nil }
             end
+
+            context 'with FF enabled' do
+              before do
+                stub_feature_flags(
+                  ci_pending_builds_project_runners_decoupling: true,
+                  ci_queueing_builds_enabled_checks: true)
+              end
+
+              it 'does not pick a build' do
+                expect(build).to be_nil
+                expect(pending_job.reload).to be_failed
+                expect(pending_job.queuing_entry).to be_nil
+              end
+            end
+          end
         end
 
         context 'allow group runners' do