Skip to content
代码片段 群组 项目
提交 22754b66 编辑于 作者: Sanad Liaquat's avatar Sanad Liaquat
浏览文件

Merge branch 'andrey-fix-knapsack-pattern' into 'master'

Prevent empty array return for qa_tests

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



Merged-by: default avatarSanad Liaquat <sliaquat@gitlab.com>
Approved-by: default avatarSanad Liaquat <sliaquat@gitlab.com>
Co-authored-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
No related branches found
No related tags found
无相关合并请求
......@@ -126,6 +126,7 @@ def qa_spec_directories_for_devops_stage
return unless devops_stage
spec_dirs = stage_specs(devops_stage)
return if spec_dirs.empty?
grp_name = group_name_from_mr_labels
return spec_dirs if grp_name.nil?
......@@ -155,7 +156,7 @@ def changed_files
# @param [Array<String>] devops_stages
# @return [Array]
def stage_specs(*devops_stages)
Dir.glob("qa/specs/**/*/").select { |dir| dir =~ %r{\d+_(#{devops_stages.join('|')})/$} }
Dir.glob("qa/specs/features/**/*/").select { |dir| dir =~ %r{\d+_(#{devops_stages.join('|')})/$} }
end
end
end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册