Skip to content
代码片段 群组 项目
提交 1b5b0ebb 编辑于 作者: 路志远's avatar 路志远
浏览文件

Rename param "filter_by_precise_time_range"

上级 3c39b731
No related branches found
No related tags found
无相关合并请求
......@@ -36,7 +36,7 @@ def mergeable_ci_state?
def mono_central_pipeline
monorepo_service = ::MergeRequests::MonorepoService.new(project.root_ancestor, source_branch)
monorepo_service.central_pipeline(use_precise_time_range: false)
monorepo_service.central_pipeline(filter_by_precise_time_range: false)
end
end
end
......@@ -127,14 +127,14 @@ def cancel_lease!
Gitlab::ExclusiveLease.cancel(lease_key, lease_value)
end
# "use_precise_time_range" is used to solve the problem of circular references.
def central_pipeline(use_precise_time_range: true)
# "filter_by_precise_time_range" is used to solve the problem of circular references.
def central_pipeline(filter_by_precise_time_range: true)
return if ci_central_project.nil?
pipelines = ::Ci::PipelinesFinder.new(
ci_central_project,
@root_group.owners.allow_cross_joins_across_databases(url: "https://jihulab.com/gitlab-cn/gitlab/-/issues/4002").first,
central_pipeline_finder_params(use_precise_time_range)
central_pipeline_finder_params(filter_by_precise_time_range)
).execute
pipelines.find do |pipeline|
......@@ -214,10 +214,11 @@ def ci_central_project
@ci_central_project ||= @root_group.projects.find_by_path(CI_CENTRAL_PROJECT_NAME)
end
def central_pipeline_finder_params(use_precise_time_range)
def central_pipeline_finder_params(filter_by_precise_time_range)
finder_params = { updated_after: merge_requests.first.created_at, ref: CI_CENTRAL_PROJECT_DEFAULT_BRANCH }
if use_precise_time_range && (merge_requests_list_status == :merged || merge_requests_list_status == :closed)
if filter_by_precise_time_range &&
(merge_requests_list_status == :merged || merge_requests_list_status == :closed)
finder_params[:updated_before] = merged_at
end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册