Commit 2885943e authored by Dylan Griffith's avatar Dylan Griffith

Merge branch '333765-feature-flag-rollout-of-ci_quota_check_on_retries' into 'master'

Remove `ci_quota_check_on_retries` feature flag

See merge request gitlab-org/gitlab!65044
parents 80a84822 0ab0678d
---
name: ci_quota_check_on_retries
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62702
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333765
milestone: '14.0'
type: development
group: group::pipeline execution
default_enabled: false
......@@ -40,8 +40,6 @@ module EE
override :check_assignable_runners!
def check_assignable_runners!(build)
return unless ::Feature.enabled?(:ci_quota_check_on_retries, project, default_enabled: :yaml)
runner_minutes = ::Gitlab::Ci::Minutes::RunnersAvailability.new(project)
return if runner_minutes.available?(build.build_matcher)
......
......@@ -19,8 +19,7 @@ module EE
end
def ci_minutes_exceeded?(build)
::Feature.enabled?(:ci_quota_check_on_retries, project, default_enabled: :yaml) &&
!runner_minutes.available?(build.build_matcher)
!runner_minutes.available?(build.build_matcher)
end
def runner_minutes
......
......@@ -153,14 +153,6 @@ RSpec.describe Ci::RetryBuildService do
it { expect(new_build).not_to be_failed }
end
context 'when the feature is disabled' do
before do
stub_feature_flags(ci_quota_check_on_retries: false)
end
it { expect(new_build).not_to be_failed }
end
end
end
end
......
......@@ -36,20 +36,6 @@ RSpec.describe Ci::RetryPipelineService do
expect(build('rspec 2')).to be_pending
expect(pipeline.reload).to be_running
end
context 'when the feature flag is disabled' do
before do
stub_feature_flags(ci_quota_check_on_retries: false)
end
it 'enqueues all builds' do
service.execute(pipeline)
expect(build('rspec 1')).to be_pending
expect(build('rspec 2')).to be_pending
expect(pipeline.reload).to be_running
end
end
end
def build(name)
......
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