From 989cd671cba392b07e48057f02e0b4dd090b48d2 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sun, 24 Sep 2023 10:51:00 -1000 Subject: Revert "oeqa/utils/gitarchive: fix tag computation when creating archive" This reverts commit d0f8d5915a9ad3340a553b4a22f91074d7e679c9. This is causing errors with buildperf on the autobuilder. (From OE-Core rev: 87eee047cf77bc3fc2c7d6b2a4f35d2642919111) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/gitarchive.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 73beafecb5..6e8040eb5c 100644 --- 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[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 -- cgit v1.2.3-54-g00ecf