diff --git a/app/services/groups/update_shared_runners_service.rb b/app/services/groups/update_shared_runners_service.rb index 35031b8de075803c7ffdccc6a05b90af62848fb7..08b43037c4cc35859f5feb883377bbd235087c2d 100644 --- a/app/services/groups/update_shared_runners_service.rb +++ b/app/services/groups/update_shared_runners_service.rb @@ -54,8 +54,6 @@ def set_shared_runners_enabled!(enabled) shared_runners_enabled: enabled, allow_descendants_override_disabled_shared_runners: false) - return if enabled && Feature.disabled?(:enable_shared_runners_for_descendants, group) - group_ids = group.descendants unless group_ids.empty? Group.by_id(group_ids).update_all( diff --git a/config/feature_flags/development/enable_shared_runners_for_descendants.yml b/config/feature_flags/development/enable_shared_runners_for_descendants.yml deleted file mode 100644 index 623057e61343d4d54550dad01b0bd34143069909..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/enable_shared_runners_for_descendants.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: enable_shared_runners_for_descendants -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124728 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416379 -milestone: '16.2' -type: development -group: group::runner -default_enabled: false diff --git a/doc/ci/runners/runners_scope.md b/doc/ci/runners/runners_scope.md index 8551a783af4176749c0216b2f0dbe0097c9d50c7..77cb0087e6aa8999f07a7168b970e2ed866cf873 100644 --- a/doc/ci/runners/runners_scope.md +++ b/doc/ci/runners/runners_scope.md @@ -139,10 +139,6 @@ To disable shared runners for a group: 1. Optional. To allow shared runners to be enabled for individual projects or subgroups, select **Allow projects and subgroups to override the group setting**. -NOTE: -If you re-enable the shared runners for a group after you disable them, a user with the -Owner or Maintainer role must manually change this setting for each project subgroup or project. - ### How shared runners pick jobs Shared runners process jobs by using a fair usage queue. This queue prevents diff --git a/spec/services/groups/update_shared_runners_service_spec.rb b/spec/services/groups/update_shared_runners_service_spec.rb index 964b9cc5fed80c16e5a1efd048a7a8acd27be5b7..00eabb5c875c43aac08512581b8fb5afb9ef04bc 100644 --- a/spec/services/groups/update_shared_runners_service_spec.rb +++ b/spec/services/groups/update_shared_runners_service_spec.rb @@ -67,22 +67,6 @@ .and change { sub_group.shared_runners_enabled }.from(false).to(true) .and change { project.shared_runners_enabled }.from(false).to(true) end - - context 'when enable_shared_runners_for_descendants feature flag is disabled' do - before do - stub_feature_flags(enable_shared_runners_for_descendants: false) - end - - it 'enables shared Runners only for itself' do - expect do - expect(subject[:status]).to eq(:success) - - reload_models(group, sub_group, project) - end.to change { group.shared_runners_enabled }.from(false).to(true) - .and not_change { sub_group.shared_runners_enabled }.from(false) - .and not_change { project.shared_runners_enabled }.from(false) - end - end end context 'when group has pending builds' do