Commit 86773e31 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch '345587-remove-FF-ci_fix_order_of_subsequent_jobs' into 'master'

Remove FF ci_fix_order_of_subsequent_jobs

See merge request gitlab-org/gitlab!84506
parents a369b05c a3c2e9e3
...@@ -22,15 +22,9 @@ module Ci ...@@ -22,15 +22,9 @@ module Ci
end end
def dependent_jobs def dependent_jobs
dependent_jobs = stage_dependent_jobs ordered_by_dag(
.or(needs_dependent_jobs) stage_dependent_jobs.or(needs_dependent_jobs).ordered_by_stage
.ordered_by_stage )
if ::Feature.enabled?(:ci_fix_order_of_subsequent_jobs, @processable.pipeline.project, default_enabled: :yaml)
dependent_jobs = ordered_by_dag(dependent_jobs)
end
dependent_jobs
end end
def process(job) def process(job)
......
---
name: ci_fix_order_of_subsequent_jobs
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74394
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345587
milestone: '14.9'
type: development
group: group::pipeline authoring
default_enabled: false
...@@ -196,25 +196,6 @@ RSpec.describe Ci::AfterRequeueJobService, :sidekiq_inline do ...@@ -196,25 +196,6 @@ RSpec.describe Ci::AfterRequeueJobService, :sidekiq_inline do
c2: 'created' c2: 'created'
) )
end end
context 'when the FF ci_fix_order_of_subsequent_jobs is disabled' do
before do
stub_feature_flags(ci_fix_order_of_subsequent_jobs: false)
end
it 'does not mark b1 as processable', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/356571' do
execute_after_requeue_service(a1)
check_jobs_statuses(
a1: 'pending',
a2: 'created',
b1: 'skipped',
b2: 'created',
c1: 'created',
c2: 'created'
)
end
end
end end
private private
......
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