From 4f2cdb51df0f2729055ec4dc6960ae347163da16 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Thu, 1 Mar 2018 12:39:30 +0100
Subject: [PATCH 1/2] 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.
---
 app/models/commit_status.rb                             | 2 +-
 changelogs/unreleased/zj-version-string-grouping-ci.yml | 5 +++++
 spec/models/commit_status_spec.rb                       | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/zj-version-string-grouping-ci.yml

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|

From 91e6a672848f1b88e061d2fee9170ca7bd7f812e Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Fri, 2 Mar 2018 09:51:36 +0100
Subject: [PATCH 2/2] Update docs on grouping CI jobs

---
 doc/ci/pipelines.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index ac4a9b0ed27..856d7f264e4 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -121,8 +121,9 @@ The basic requirements is that there are two numbers separated with one of
 the following (you can even use them interchangeably):
 
 - a space
-- a backslash (`/`)
+- a forward slash (`/`)
 - a colon (`:`)
+- a dot (`.`)
 
 >**Note:**
 More specifically, [it uses][regexp] this regular expression: `\d+[\s:\/\\]+\d+\s*`.