From 5d1e0045898a0ddb18790b5e0c4f88da15c384ff Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 22 Sep 2016 11:41:53 -0600 Subject: [PATCH] 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 --- teuthology/packaging.py | 2 +- teuthology/test/test_packaging.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/teuthology/packaging.py b/teuthology/packaging.py index 860e9764e8..80b8d9d003 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 fc56caca88..9c466a7500 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 -- 2.39.5