Revert "oeqa/utils/gitarchive: fix tag computation when creating archive"

This reverts commit d0f8d5915a9ad3340a553b4a22f91074d7e679c9.

This is causing errors with buildperf on the autobuilder.

Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py
index 73beafecb5fbd8665393ec61b8a6961e96a801f7..6e8040eb5c960d4f3a17a1acbcbd486fb6b8298b 100644 (file)
--- a/meta/lib/oeqa/utils/gitarchive.py
+++ b/meta/lib/oeqa/utils/gitarchive.py
@@ -116,8 +116,7 @@ def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern,
         tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})')
 
         keyws['tag_number'] = 0
-        tags_refs = repo.run_cmd(['ls-remote', '--refs', '--tags', '-q'])
-        for existing_tag in ["".join(d.split()[1].split('/', 2)[2:]) for d in tags_refs.splitlines()]:
+        for existing_tag in repo.run_cmd('tag').splitlines():
             match = re.match(tag_re, existing_tag)
 
             if match and int(match.group('tag_number')) >= keyws['tag_number']:
@@ -182,8 +181,7 @@ def get_test_runs(log, repo, tag_name, **kwargs):
 
     # Get a list of all matching tags
     tag_pattern = tag_name.format(**str_fields)
-    revs = repo.run_cmd(['ls-remote', '--refs', '--tags', 'origin', '-q', tag_pattern]).splitlines()
-    tags = ["".join(d.split()[1].split('/', 2)[2:]) for d in revs]
+    tags = repo.run_cmd(['tag', '-l', tag_pattern]).splitlines()
     log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern)
 
     # Parse undefined fields from tag names