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
c2c7745d
Commit
c2c7745d
authored
Jan 23, 2021
by
Furkan Ayhan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF ci_auto_cancel_all_pipelines
It was enabled by default
parent
e35cc79a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
31 deletions
+1
-31
config/feature_flags/development/ci_auto_cancel_all_pipelines.yml
...eature_flags/development/ci_auto_cancel_all_pipelines.yml
+0
-8
lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
+1
-9
spec/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb
...gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb
+0
-14
No files found.
config/feature_flags/development/ci_auto_cancel_all_pipelines.yml
deleted
100644 → 0
View file @
e35cc79a
---
name
:
ci_auto_cancel_all_pipelines
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46686
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/275997
milestone
:
'
13.6'
type
:
development
group
:
group::pipeline authoring
default_enabled
:
true
lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
View file @
c2c7745d
...
@@ -25,7 +25,7 @@ module Gitlab
...
@@ -25,7 +25,7 @@ module Gitlab
# rubocop: disable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
auto_cancelable_pipelines
def
auto_cancelable_pipelines
p
ipelin
es
p
roject
.
all_pipelines
.
ci_and_parent_sourc
es
.
where
(
ref:
pipeline
.
ref
)
.
where
(
ref:
pipeline
.
ref
)
.
where
.
not
(
id:
pipeline
.
same_family_pipeline_ids
)
.
where
.
not
(
id:
pipeline
.
same_family_pipeline_ids
)
.
where
.
not
(
sha:
project
.
commit
(
pipeline
.
ref
).
try
(
:id
))
.
where
.
not
(
sha:
project
.
commit
(
pipeline
.
ref
).
try
(
:id
))
...
@@ -33,14 +33,6 @@ module Gitlab
...
@@ -33,14 +33,6 @@ module Gitlab
.
with_only_interruptible_builds
.
with_only_interruptible_builds
end
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: enable CodeReuse/ActiveRecord
def
pipelines
if
::
Feature
.
enabled?
(
:ci_auto_cancel_all_pipelines
,
project
,
default_enabled:
true
)
project
.
all_pipelines
.
ci_and_parent_sources
else
project
.
ci_pipelines
end
end
end
end
end
end
end
end
...
...
spec/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb
View file @
c2c7745d
...
@@ -58,20 +58,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::CancelPendingPipelines do
...
@@ -58,20 +58,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::CancelPendingPipelines do
expect
(
build_statuses
(
child_pipeline
)).
to
contain_exactly
(
'canceled'
)
expect
(
build_statuses
(
child_pipeline
)).
to
contain_exactly
(
'canceled'
)
end
end
context
'when FF ci_auto_cancel_all_pipelines is disabled'
do
before
do
stub_feature_flags
(
ci_auto_cancel_all_pipelines:
false
)
end
it
'does not cancel interruptible builds of child pipeline'
do
expect
(
build_statuses
(
child_pipeline
)).
to
contain_exactly
(
'running'
)
perform
expect
(
build_statuses
(
child_pipeline
)).
to
contain_exactly
(
'running'
)
end
end
end
end
context
'when the child pipeline has not an interruptible job'
do
context
'when the child pipeline has not an interruptible job'
do
...
...
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