Merge branch 'pedropombeiro/321368/add-ci_runner_limits_disable-ff' into 'master'

Introduce ci_runner_limits_override feature flag

See merge request gitlab-org/gitlab!67152

app/models/ci/runner_namespace.rb

@@ -8,6 +8,7 @@ module Ci
     self.limit_scope = :group
     self.limit_relation = :recent_runners
     self.limit_feature_flag = :ci_runner_limits
+    self.limit_feature_flag_for_override = :ci_runner_limits_override
 
     belongs_to :runner, inverse_of: :runner_namespaces
     belongs_to :namespace, inverse_of: :runner_namespaces, class_name: '::Namespace'

app/models/ci/runner_project.rb

@@ -8,6 +8,7 @@ module Ci
     self.limit_scope = :project
     self.limit_relation = :recent_runners
     self.limit_feature_flag = :ci_runner_limits
+    self.limit_feature_flag_for_override = :ci_runner_limits_override
 
     belongs_to :runner, inverse_of: :runner_projects
     belongs_to :project, inverse_of: :runner_projects

config/feature_flags/development/ci_runner_limits_override.yml

+---
+name: ci_runner_limits_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67152
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337224
+milestone: '14.2'
+type: development
+group: group::runner
+default_enabled: false

spec/models/ci/runner_namespace_spec.rb

@@ -4,6 +4,12 @@ require 'spec_helper'
 
 RSpec.describe Ci::RunnerNamespace do
   it_behaves_like 'includes Limitable concern' do
+    before do
+      skip_default_enabled_yaml_check
+
+      stub_feature_flags(ci_runner_limits_override: false)
+    end
+
     subject { build(:ci_runner_namespace, group: create(:group, :nested), runner: create(:ci_runner, :group)) }
   end
 end

spec/models/ci/runner_project_spec.rb

@@ -4,6 +4,12 @@ require 'spec_helper'
 
 RSpec.describe Ci::RunnerProject do
   it_behaves_like 'includes Limitable concern' do
+    before do
+      skip_default_enabled_yaml_check
+
+      stub_feature_flags(ci_runner_limits_override: false)
+    end
+
     subject { build(:ci_runner_project, project: create(:project), runner: create(:ci_runner, :project)) }
   end
 end

spec/requests/api/ci/runner/runners_post_spec.rb

@@ -98,14 +98,33 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             before do
               create(:ci_runner, runner_type: :project_type, projects: [project], contacted_at: 1.second.ago)
               create(:plan_limits, :default_plan, ci_registered_project_runners: 1)
+
+              skip_default_enabled_yaml_check
+              stub_feature_flags(ci_runner_limits_override: ci_runner_limits_override)
             end
 
-            it 'does not create runner' do
-              request
+            context 'with ci_runner_limits_override FF disabled' do
+              let(:ci_runner_limits_override) { false }
+
+              it 'does not create runner' do
+                request
 
-              expect(response).to have_gitlab_http_status(:bad_request)
-              expect(json_response['message']).to include('runner_projects.base' => ['Maximum number of ci registered project runners (1) exceeded'])
-              expect(project.runners.reload.size).to eq(1)
+                expect(response).to have_gitlab_http_status(:bad_request)
+                expect(json_response['message']).to include('runner_projects.base' => ['Maximum number of ci registered project runners (1) exceeded'])
+                expect(project.runners.reload.size).to eq(1)
+              end
+            end
+
+            context 'with ci_runner_limits_override FF enabled' do
+              let(:ci_runner_limits_override) { true }
+
+              it 'creates runner' do
+                request
+
+                expect(response).to have_gitlab_http_status(:created)
+                expect(json_response['message']).to be_nil
+                expect(project.runners.reload.size).to eq(2)
+              end
             end
           end
 
@@ -113,6 +132,9 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             before do
               create(:ci_runner, runner_type: :project_type, projects: [project], created_at: 14.months.ago, contacted_at: 13.months.ago)
               create(:plan_limits, :default_plan, ci_registered_project_runners: 1)
+
+              skip_default_enabled_yaml_check
+              stub_feature_flags(ci_runner_limits_override: false)
             end
 
             it 'creates runner' do
@@ -182,14 +204,33 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             before do
               create(:ci_runner, runner_type: :group_type, groups: [group], contacted_at: nil, created_at: 1.month.ago)
               create(:plan_limits, :default_plan, ci_registered_group_runners: 1)
+
+              skip_default_enabled_yaml_check
+              stub_feature_flags(ci_runner_limits_override: ci_runner_limits_override)
             end
 
-            it 'does not create runner' do
-              request
+            context 'with ci_runner_limits_override FF disabled' do
+              let(:ci_runner_limits_override) { false }
+
+              it 'does not create runner' do
+                request
 
-              expect(response).to have_gitlab_http_status(:bad_request)
-              expect(json_response['message']).to include('runner_namespaces.base' => ['Maximum number of ci registered group runners (1) exceeded'])
-              expect(group.runners.reload.size).to eq(1)
+                expect(response).to have_gitlab_http_status(:bad_request)
+                expect(json_response['message']).to include('runner_namespaces.base' => ['Maximum number of ci registered group runners (1) exceeded'])
+                expect(group.runners.reload.size).to eq(1)
+              end
+            end
+
+            context 'with ci_runner_limits_override FF enabled' do
+              let(:ci_runner_limits_override) { true }
+
+              it 'creates runner' do
+                request
+
+                expect(response).to have_gitlab_http_status(:created)
+                expect(json_response['message']).to be_nil
+                expect(group.runners.reload.size).to eq(2)
+              end
             end
           end
 
@@ -198,6 +239,9 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
               create(:ci_runner, runner_type: :group_type, groups: [group], created_at: 4.months.ago, contacted_at: 3.months.ago)
               create(:ci_runner, runner_type: :group_type, groups: [group], contacted_at: nil, created_at: 4.months.ago)
               create(:plan_limits, :default_plan, ci_registered_group_runners: 1)
+
+              skip_default_enabled_yaml_check
+              stub_feature_flags(ci_runner_limits_override: false)
             end
 
             it 'creates runner' do

spec/requests/api/ci/runners_spec.rb

@@ -1003,13 +1003,31 @@ RSpec.describe API::Ci::Runners do
           context 'when it exceeds the application limits' do
             before do
               create(:plan_limits, :default_plan, ci_registered_project_runners: 1)
+
+              skip_default_enabled_yaml_check
+              stub_feature_flags(ci_runner_limits_override: ci_runner_limits_override)
             end
 
-            it 'does not enable specific runner' do
-              expect do
-                post api("/projects/#{project.id}/runners", admin), params: { runner_id: new_project_runner.id }
-              end.not_to change { project.runners.count }
-              expect(response).to have_gitlab_http_status(:bad_request)
+            context 'with ci_runner_limits_override FF disabled' do
+              let(:ci_runner_limits_override) { false }
+
+              it 'does not enable specific runner' do
+                expect do
+                  post api("/projects/#{project.id}/runners", admin), params: { runner_id: new_project_runner.id }
+                end.not_to change { project.runners.count }
+                expect(response).to have_gitlab_http_status(:bad_request)
+              end
+            end
+
+            context 'with ci_runner_limits_override FF enabled' do
+              let(:ci_runner_limits_override) { true }
+
+              it 'enables specific runner' do
+                expect do
+                  post api("/projects/#{project.id}/runners", admin), params: { runner_id: new_project_runner.id }
+                end.to change { project.runners.count }
+                expect(response).to have_gitlab_http_status(:created)
+              end
             end
           end
         end