Commit 9b4726f4 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'mo-remove-pending-builds-async-update-ff' into 'master'

Remove ci_pending_builds_async_update feature flag

See merge request gitlab-org/gitlab!75724
parents b729388c 7fe2653c
...@@ -229,11 +229,7 @@ module Groups ...@@ -229,11 +229,7 @@ module Groups
end end
def update_pending_builds def update_pending_builds
if Feature.enabled?(:ci_pending_builds_async_update, default_enabled: :yaml) ::Ci::PendingBuilds::UpdateGroupWorker.perform_async(group.id, pending_builds_params)
::Ci::PendingBuilds::UpdateGroupWorker.perform_async(group.id, pending_builds_params)
else
::Ci::UpdatePendingBuildService.new(group, pending_builds_params).execute
end
end end
def pending_builds_params def pending_builds_params
......
...@@ -245,11 +245,7 @@ module Projects ...@@ -245,11 +245,7 @@ module Projects
end end
def update_pending_builds def update_pending_builds
if Feature.enabled?(:ci_pending_builds_async_update, default_enabled: :yaml) ::Ci::PendingBuilds::UpdateProjectWorker.perform_async(project.id, pending_builds_params)
::Ci::PendingBuilds::UpdateProjectWorker.perform_async(project.id, pending_builds_params)
else
::Ci::UpdatePendingBuildService.new(project, pending_builds_params).execute
end
end end
def pending_builds_params def pending_builds_params
......
---
name: ci_pending_builds_async_update
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75197
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346641
milestone: '14.6'
type: development
group: group::pipeline execution
default_enabled: false
...@@ -814,20 +814,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do ...@@ -814,20 +814,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id) expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id)
expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids) expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids)
end end
context 'when ci_pending_builds_async_update is disabled' do
let(:update_pending_build_service) { instance_double(::Ci::PendingBuilds::UpdateGroupWorker) }
before do
stub_feature_flags(ci_pending_builds_async_update: false)
end
it 'does not call the new worker' do
expect(::Ci::PendingBuilds::UpdateGroupWorker).not_to receive(:perform_async)
transfer_service.execute(new_parent_group)
end
end
end end
end end
......
...@@ -189,20 +189,6 @@ RSpec.describe Projects::TransferService do ...@@ -189,20 +189,6 @@ RSpec.describe Projects::TransferService do
expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id) expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id)
expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids) expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids)
end end
context 'when ci_pending_builds_async_update is disabled' do
let(:update_pending_build_service) { instance_double(::Ci::PendingBuilds::UpdateProjectWorker) }
before do
stub_feature_flags(ci_pending_builds_async_update: false)
end
it 'does not call the new worker' do
expect(::Ci::PendingBuilds::UpdateProjectWorker).not_to receive(:perform_async)
execute_transfer
end
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment