14965: Mocks FreshBase _poll_time to avoid comparing mock and int

[arvados.git] / services / nodemanager / arvados_version.py

diff --git a/services/nodemanager/arvados_version.py b/services/nodemanager/arvados_version.py
index e7a4914bf2662a9624f4e5ad4d595c3a2644a5dd..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- a/services/nodemanager/arvados_version.py
+++ b/services/nodemanager/arvados_version.py
@@ -2,15 +2,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import subprocess32 as subprocess
+import subprocess
 import time
 import os
 import re
 
 def git_latest_tag():
-    gitinfo = subprocess.check_output(
-        ['git', 'describe', '--abbrev=0']).strip()
-    return str(gitinfo.decode('utf-8'))
+    gittags = subprocess.check_output(['git', 'tag', '-l']).split()
+    gittags.sort(key=lambda s: [int(u) for u in s.split(b'.')],reverse=True)
+    return str(next(iter(gittags)).decode('utf-8'))
 
 def git_timestamp_tag():
     gitinfo = subprocess.check_output(