Commit edc4e0a1 authored by Marius Bobin's avatar Marius Bobin

Merge branch '349977-remove-ci_order_subsequent_jobs_by_stage' into 'master'

Remove FF ci_order_subsequent_jobs_by_stage

See merge request gitlab-org/gitlab!79952
parents 4833b0ba f87e7dbd
...@@ -22,13 +22,9 @@ module Ci ...@@ -22,13 +22,9 @@ module Ci
end end
def dependent_jobs def dependent_jobs
if ::Feature.enabled?(:ci_order_subsequent_jobs_by_stage, @processable.pipeline.project, default_enabled: :yaml) stage_dependent_jobs
stage_dependent_jobs .or(needs_dependent_jobs.except(:preload))
.or(needs_dependent_jobs.except(:preload)) .ordered_by_stage
.ordered_by_stage
else
stage_dependent_jobs | needs_dependent_jobs
end
end end
def process(job) def process(job)
......
---
name: ci_order_subsequent_jobs_by_stage
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77528
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349977
milestone: '14.7'
type: development
group: group::pipeline authoring
default_enabled: true
...@@ -1043,22 +1043,6 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService do ...@@ -1043,22 +1043,6 @@ RSpec.describe Ci::PipelineProcessing::AtomicProcessingService do
expect(all_builds_names).to eq(%w[A1 A2 B]) expect(all_builds_names).to eq(%w[A1 A2 B])
expect(all_builds_statuses).to eq(%w[pending created created]) expect(all_builds_statuses).to eq(%w[pending created created])
end end
context 'when the FF ci_order_subsequent_jobs_by_stage is disabled' do
before do
stub_feature_flags(ci_order_subsequent_jobs_by_stage: false)
end
it 'processes subsequent jobs in an incorrect order when playing first job' do
expect(all_builds_names).to eq(%w[A1 A2 B])
expect(all_builds_statuses).to eq(%w[manual skipped skipped])
play_manual_action('A1')
expect(all_builds_names).to eq(%w[A1 A2 B])
expect(all_builds_statuses).to eq(%w[pending created skipped])
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