From 6ce76bdd2d31467917a1dac168ce75e4ce5a65fd Mon Sep 17 00:00:00 2001
From: Vladimir Shushlin <vlad@shushlin.dev>
Date: Tue, 27 Jun 2023 14:55:37 +0200
Subject: [PATCH] Enable shared runners on descendants
Just remove the FF introduced in the previous commit
See more in https://gitlab.com/gitlab-org/gitlab/-/issues/299823
Changelog: added
---
.../groups/update_shared_runners_service.rb | 2 --
.../enable_shared_runners_for_descendants.yml | 8 --------
doc/ci/runners/runners_scope.md | 4 ----
.../groups/update_shared_runners_service_spec.rb | 16 ----------------
4 files changed, 30 deletions(-)
delete mode 100644 config/feature_flags/development/enable_shared_runners_for_descendants.yml
diff --git a/app/services/groups/update_shared_runners_service.rb b/app/services/groups/update_shared_runners_service.rb
index 35031b8de0758..08b43037c4cc3 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 623057e61343d..0000000000000
--- 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 8551a783af417..77cb0087e6aa8 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 964b9cc5fed80..00eabb5c875c4 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
--
GitLab