Skip to content
代码片段 群组 项目
未验证 提交 c7a14efd 编辑于 作者: Fabio Pitino's avatar Fabio Pitino 提交者: GitLab
浏览文件

Merge branch...

Merge branch '464300-follow-up-from-pep-mvc-define-ssot-for-pipeline-rejected-by-rules' into 'master' 

Refactor check for execution policy pipelines filtered by rules

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159235



Merged-by: default avatarFabio Pitino <fpitino@gitlab.com>
Approved-by: default avatarFabio Pitino <fpitino@gitlab.com>
Co-authored-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -40,13 +40,11 @@ def perform! ...@@ -40,13 +40,11 @@ def perform!
command.pipeline_execution_policies = [] command.pipeline_execution_policies = []
pipeline_execution_policy_configs.each do |config| pipeline_execution_policy_configs.each do |config|
response = create_pipeline(config.content) response = create_pipeline(config.content)
pipeline = response.payload
if response.success? if response.success?
command.pipeline_execution_policies << PipelineExecutionPolicy.new( command.pipeline_execution_policies << PipelineExecutionPolicy.new(pipeline, config.strategy)
response.payload, elsif pipeline.filtered_as_empty?
config.strategy
)
elsif pipeline_filtered_by_rules?(response.payload)
# no-op: we ignore empty pipelines # no-op: we ignore empty pipelines
else else
return error("Pipeline execution policy error: #{response.message}", failure_reason: :config_error) return error("Pipeline execution policy error: #{response.message}", failure_reason: :config_error)
...@@ -77,11 +75,6 @@ def create_pipeline(content) ...@@ -77,11 +75,6 @@ def create_pipeline(content)
# Additional parameters will be added in https://gitlab.com/gitlab-org/gitlab/-/issues/462004 # Additional parameters will be added in https://gitlab.com/gitlab-org/gitlab/-/issues/462004
) )
end end
def pipeline_filtered_by_rules?(pipeline)
pipeline.failure_reason.present? &&
!::Enums::Ci::Pipeline.persistable_failure_reason?(pipeline.failure_reason.to_sym)
end
end end
end end
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册