Commit 873a1d93 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Merge branch 'zj-revert-bad-grouping' into 'master'

Revert "Allow CI/CD Jobs being grouped on version strings"

Closes #44615

See merge request gitlab-org/gitlab-ce!18170
parents e43c01e6 695684c8
......@@ -191,7 +191,6 @@ entry.
- Enable privileged mode for GitLab Runner. !17528
- Expose GITLAB_FEATURES as CI/CD variable (fixes #40994).
- Upgrade GitLab Workhorse to 4.0.0.
- Allow CI/CD Jobs being grouped on version strings.
- Add discussions API for Issues and Snippets.
- Add one group board to Libre.
- Add support for filtering by source and target branch to merge requests API.
......
......@@ -141,7 +141,7 @@ def before_sha
end
def group_name
name.to_s.gsub(%r{\d+[\.\s:/\\]+\d+\s*}, '').strip
name.to_s.gsub(%r{\d+[\s:/\\]+\d+\s*}, '').strip
end
def failed_but_allowed?
......
......@@ -368,9 +368,7 @@ def create_status(**opts)
'rspec:windows 0 : / 1' => 'rspec:windows',
'rspec:windows 0 : / 1 name' => 'rspec:windows name',
'0 1 name ruby' => 'name ruby',
'0 :/ 1 name ruby' => 'name ruby',
'golang test 1.8' => 'golang test',
'1.9 golang test' => 'golang test'
'0 :/ 1 name ruby' => 'name ruby'
}
tests.each do |name, group_name|
......
Supports Markdown
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