Merge branch 'mb-ci-allow-admins-to-set-active-pipelines-limit' into 'master'

Allow administrators to set active pipelines limits

See merge request gitlab-org/gitlab!83855

app/controllers/admin/plan_limits_controller.rb

@@ -40,6 +40,7 @@ class Admin::PlanLimitsController < Admin::ApplicationController
       generic_packages_max_file_size
       ci_pipeline_size
       ci_active_jobs
+      ci_active_pipelines
       ci_project_subscriptions
       ci_pipeline_schedules
       ci_needs_size_limit

app/views/admin/application_settings/_ci_cd.html.haml

@@ -105,6 +105,9 @@
               .form-group
                 = f.label :ci_active_jobs, s_('AdminSettings|Total number of jobs in currently active pipelines')
                 = f.number_field :ci_active_jobs, class: 'form-control gl-form-input'
+              .form-group
+                = f.label :ci_active_pipelines, s_('AdminSettings|Maximum number of active pipelines per project')
+                = f.number_field :ci_active_pipelines, class: 'form-control gl-form-input'
               .form-group
                 = f.label :ci_project_subscriptions, s_('AdminSettings|Maximum number of pipeline subscriptions to and from a project')
                 = f.number_field :ci_project_subscriptions, class: 'form-control gl-form-input'

locale/gitlab.pot

@@ -2676,6 +2676,9 @@ msgstr ""
 msgid "AdminSettings|Maximum number of DAG dependencies that a job can have"
 msgstr ""
 
+msgid "AdminSettings|Maximum number of active pipelines per project"
+msgstr ""
+
 msgid "AdminSettings|Maximum number of jobs in a single pipeline"
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -337,6 +337,7 @@ RSpec.describe 'Admin updates settings' do
         page.within('.as-ci-cd') do
           fill_in 'plan_limits_ci_pipeline_size', with: 10
           fill_in 'plan_limits_ci_active_jobs', with: 20
+          fill_in 'plan_limits_ci_active_pipelines', with: 25
           fill_in 'plan_limits_ci_project_subscriptions', with: 30
           fill_in 'plan_limits_ci_pipeline_schedules', with: 40
           fill_in 'plan_limits_ci_needs_size_limit', with: 50
@@ -348,6 +349,7 @@ RSpec.describe 'Admin updates settings' do
         limits = default_plan.reload.limits
         expect(limits.ci_pipeline_size).to eq(10)
         expect(limits.ci_active_jobs).to eq(20)
+        expect(limits.ci_active_pipelines).to eq(25)
         expect(limits.ci_project_subscriptions).to eq(30)
         expect(limits.ci_pipeline_schedules).to eq(40)
         expect(limits.ci_needs_size_limit).to eq(50)