From: Zack Cerza <zack@redhat.com>
Date: Thu, 22 Sep 2016 17:41:53 +0000 (-0600)
Subject: GitbuilderProject: remove 'v' from version values
X-Git-Tag: 1.1.0~522^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F951%2Fhead;p=teuthology.git

GitbuilderProject: remove 'v' from version values

Some version values have a leading 'v', e.g.:
http://gitbuilder.ceph.com/ceph-rpm-centos7-x86_64-basic/ref/v10.2.0/version
is 'v10.2.0', whereas:
http://gitbuilder.ceph.com/ceph-rpm-centos7-x86_64-basic/ref/jewel/version
is '10.2.3-0'.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 860e9764e..80b8d9d00 100644
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -732,7 +732,7 @@ class GitbuilderProject(object):
 
         if not resp.ok:
             raise VersionNotFoundError(url)
-        version = resp.text.strip()
+        version = resp.text.strip().lstrip('v')
         log.info("Found version: {0}".format(version))
         return version
 
diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index fc56caca8..9c466a750 100644
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -573,6 +573,14 @@ class TestGitbuilderProject(TestBuilderProject):
         super(TestGitbuilderProject, self)\
             .test_get_package_version_found()
 
+    def test_version_strip_v(self):
+        resp = Mock()
+        resp.ok = True
+        resp.text = "v0.90.0"
+        self.m_get_response.return_value = resp
+        super(TestGitbuilderProject, self)\
+            .test_get_package_version_found()
+
     def test_get_package_sha1_fetched_found(self):
         resp = Mock()
         resp.ok = True