diff --git a/app/workers/build_queue_worker.rb b/app/workers/build_queue_worker.rb index aa3c03f773e9ae735415111ccdc2938d3fba9c04..4ab08bbd7fed70da6a4ff7eb88779ba0f9fe9d79 100644 --- a/app/workers/build_queue_worker.rb +++ b/app/workers/build_queue_worker.rb @@ -10,7 +10,7 @@ class BuildQueueWorker # rubocop:disable Scalability/IdempotentWorker feature_category :continuous_integration urgency :high worker_resource_boundary :cpu - data_consistency :sticky, feature_flag: :load_balancing_for_build_queue_worker + data_consistency :sticky # rubocop: disable CodeReuse/ActiveRecord def perform(build_id) diff --git a/config/feature_flags/development/load_balancing_for_build_queue_worker.yml b/config/feature_flags/development/load_balancing_for_build_queue_worker.yml deleted file mode 100644 index 1b80372ab823b670fbc10808e9217e97847127e2..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/load_balancing_for_build_queue_worker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: load_balancing_for_build_queue_worker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63212 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332586 -milestone: '14.0' -type: development -group: group::memory -default_enabled: false diff --git a/spec/workers/build_queue_worker_spec.rb b/spec/workers/build_queue_worker_spec.rb index 5f8510abf2303dc5bf2177c617cecdcd1b2563e9..0786722e64777824a09fa5aa8d050db5bc17f852 100644 --- a/spec/workers/build_queue_worker_spec.rb +++ b/spec/workers/build_queue_worker_spec.rb @@ -26,6 +26,5 @@ it_behaves_like 'worker with data consistency', described_class, - feature_flag: :load_balancing_for_build_queue_worker, data_consistency: :sticky end