Merge ~blake-rouse/maas:fix-1772679 into maas:master

[Blake Rouse]

LP: #1772679 - Fix version handling for +revno on minor version and .g for git revision.

[Newell Jensen (newell-jensen)]

LGTM

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-1772679 lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 992bd25f204c4f28dd1974d8ac50cbf1035778d5

review: Approve

[Blake Rouse (blake-rouse)]

I have ran this in the CI, hit no issues. It still running but passed the part where this would cause any issues.

http://162.213.35.104:8080/job/maas-git-manual/240/console

diff --git a/src/provisioningserver/utils/tests/test_version.py b/src/provisioningserver/utils/tests/test_version.py
index 0efd3d9..62cc686 100644
--- a/src/provisioningserver/utils/tests/test_version.py
+++ b/src/provisioningserver/utils/tests/test_version.py
@@ -188,6 +188,12 @@ class TestGetVersionTuple(MAASTestCase):
                 2, 3, 5, 0, 5, 0, '1', '2x.x3.x5x~alpha5Y', 'xxx-g1',
                 'alphaY', False)
         }),
+        ('ci version', {
+            'version': '2.4.0+6981.g011e51b+ci-0ubuntu1',
+            'expected_tuple': (
+                2, 4, 0, 0, 0, 6981, '011e51b', '2.4.0',
+                '6981.g011e51b+ci-0ubuntu1', None, False)
+        }),
     )
 
     def test__returns_expected_tuple(self):
diff --git a/src/provisioningserver/utils/version.py b/src/provisioningserver/utils/version.py
index 3f78f08..e4f6afd 100644
--- a/src/provisioningserver/utils/version.py
+++ b/src/provisioningserver/utils/version.py
@@ -135,9 +135,9 @@ def _coerce_to_int(string: str) -> int:
 
 
 def get_version_tuple(maas_version: str) -> MAASVersion:
-    version_parts = maas_version.split('-', 1)
+    version_parts = re.split(r'[-|+]', maas_version, 1)
     short_version = version_parts[0]
-    major_minor_point = re.sub(r'~.*', '', short_version).split('.')
+    major_minor_point = re.sub(r'~.*', '', short_version).split('.', 2)
     for i in range(3):
         try:
             major_minor_point[i] = _coerce_to_int(major_minor_point[i])
@@ -167,9 +167,10 @@ def get_version_tuple(maas_version: str) -> MAASVersion:
         qualifier_type_version = qualifier_types.get(qualifier_type, 0)
     revno = 0
     git_rev = ''
-    # If we find a '-g', that means the extended info indicates a git revision.
-    if '-g' in extended_info:
-        revno, git_rev = extended_info.split('-')[0:2]
+    # If we find a '-g' or '.g', that means the extended info indicates a
+    # git revision.
+    if '-g' in extended_info or '.g' in extended_info:
+        revno, git_rev = re.split(r'[-|.|+]', extended_info)[0:2]
         # Strip any non-numeric characters from the revno, just in case.
         revno = _coerce_to_int(revno)
         # Remove anything that doesn't look like a hexadecimal character.