Commit 98427fea authored by Marius Bobin's avatar Marius Bobin

Merge branch 'rename-max-decendant-depth' into 'master'

Rename MAX_DESCENDANTS_DEPTH to MAX_NESTED_CHILDREN

See merge request gitlab-org/gitlab!83535
parents 8c0d6171 38aa20c6
...@@ -9,7 +9,7 @@ module Ci ...@@ -9,7 +9,7 @@ module Ci
DuplicateDownstreamPipelineError = Class.new(StandardError) DuplicateDownstreamPipelineError = Class.new(StandardError)
MAX_DESCENDANTS_DEPTH = 2 MAX_NESTED_CHILDREN = 2
def execute(bridge) def execute(bridge)
@bridge = bridge @bridge = bridge
...@@ -77,7 +77,8 @@ module Ci ...@@ -77,7 +77,8 @@ module Ci
# TODO: Remove this condition if favour of model validation # TODO: Remove this condition if favour of model validation
# https://gitlab.com/gitlab-org/gitlab/issues/38338 # https://gitlab.com/gitlab-org/gitlab/issues/38338
if has_max_descendants_depth? # only applies to parent-child pipelines not multi-project
if has_max_nested_children?
@bridge.drop!(:reached_max_descendant_pipelines_depth) @bridge.drop!(:reached_max_descendant_pipelines_depth)
return false return false
end end
...@@ -129,11 +130,12 @@ module Ci ...@@ -129,11 +130,12 @@ module Ci
pipeline_checksums.tally.any? { |_checksum, occurrences| occurrences > 2 } pipeline_checksums.tally.any? { |_checksum, occurrences| occurrences > 2 }
end end
def has_max_descendants_depth? def has_max_nested_children?
return false unless @bridge.triggers_child_pipeline? return false unless @bridge.triggers_child_pipeline?
# only applies to parent-child pipelines not multi-project
ancestors_of_new_child = @bridge.pipeline.self_and_ancestors ancestors_of_new_child = @bridge.pipeline.self_and_ancestors
ancestors_of_new_child.count > MAX_DESCENDANTS_DEPTH ancestors_of_new_child.count > MAX_NESTED_CHILDREN
end end
def config_checksum(pipeline) def config_checksum(pipeline)
......
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