diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-01 12:39:30 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-01 12:39:30 +0100 |
| commit | 4f2cdb51df0f2729055ec4dc6960ae347163da16 (patch) | |
| tree | 3d7dc2ae90b45820b881d9dca75a09df4bed97e8 | |
| parent | bac9bb1866f47f0b1515b8705ea9eba1fa9b9ced (diff) | |
| download | gitlab-ce-4f2cdb51df0f2729055ec4dc6960ae347163da16.tar.gz | |
Allow CI/CD Jobs being grouped on version strings
This makes grouping on version number available. In general I'd like to
group based on MAJOR.MINOR version numbers for Gitaly.
| -rw-r--r-- | app/models/commit_status.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-version-string-grouping-ci.yml | 5 | ||||
| -rw-r--r-- | spec/models/commit_status_spec.rb | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 3469d5d795c..9fb5b7efec6 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -141,7 +141,7 @@ class CommitStatus < ActiveRecord::Base 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? diff --git a/changelogs/unreleased/zj-version-string-grouping-ci.yml b/changelogs/unreleased/zj-version-string-grouping-ci.yml new file mode 100644 index 00000000000..04ef0f65b1e --- /dev/null +++ b/changelogs/unreleased/zj-version-string-grouping-ci.yml @@ -0,0 +1,5 @@ +--- +title: Allow CI/CD Jobs being grouped on version strings +merge_request: +author: +type: added diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb index c536dab2681..b7ed8be69fc 100644 --- a/spec/models/commit_status_spec.rb +++ b/spec/models/commit_status_spec.rb @@ -368,7 +368,9 @@ describe CommitStatus do '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' + '0 :/ 1 name ruby' => 'name ruby', + 'golang test 1.8' => 'golang test', + '1.9 golang test' => 'golang test' } tests.each do |name, group_name| |