Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f87e7dbd
Commit
f87e7dbd
authored
Feb 04, 2022
by
Furkan Ayhan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF ci_order_subsequent_jobs_by_stage
It's already enabled by default. Changelog: other
parent
f1e83fc2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
31 deletions
+3
-31
app/services/ci/after_requeue_job_service.rb
app/services/ci/after_requeue_job_service.rb
+3
-7
config/feature_flags/development/ci_order_subsequent_jobs_by_stage.yml
...e_flags/development/ci_order_subsequent_jobs_by_stage.yml
+0
-8
spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb
.../ci/pipeline_processing/atomic_processing_service_spec.rb
+0
-16
No files found.
app/services/ci/after_requeue_job_service.rb
View file @
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
)
...
...
config/feature_flags/development/ci_order_subsequent_jobs_by_stage.yml
deleted
100644 → 0
View file @
f1e83fc2
---
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
spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb
View file @
f87e7dbd
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment