diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-16 07:55:50 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-11-12 11:30:07 -1000 |
commit | f0265a9051412eaf41290b5d86786c870112e9fc (patch) | |
tree | 7497e6003b1e1b89fd893d810a5dd370c2733070 | |
parent | b8bb4e6cb0b531507ec26d569f1f6c3e7a5aeaf0 (diff) | |
download | poky-f0265a9051412eaf41290b5d86786c870112e9fc.tar.gz |
Revert "oeqa/utils/gitarchive: fix tag computation when creating archive"
This reverts commit 5a0a7da85a3acfd4a20a07478eabefdab60f313a.
This caused failres on the build performance tests on the autobuilder.
(cherry picked from commit cbfa57a982c0e633e41d3ea00543f87ad818c43a)
(From OE-Core rev: 1506737eae894310bb98a82cf43c91f4b17d5878)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/lib/oeqa/utils/gitarchive.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 6046f183d5..cd60a605d4 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, | |||
116 | tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') | 116 | tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') |
117 | 117 | ||
118 | keyws['tag_number'] = 0 | 118 | keyws['tag_number'] = 0 |
119 | tags_refs = repo.run_cmd(['ls-remote', '--refs', '--tags', '-q']) | 119 | for existing_tag in repo.run_cmd('tag').splitlines(): |
120 | for existing_tag in ["".join(d.split()[1].split('/', 2)[2:]) for d in tags_refs.splitlines()]: | ||
121 | match = re.match(tag_re, existing_tag) | 120 | match = re.match(tag_re, existing_tag) |
122 | 121 | ||
123 | if match and int(match.group('tag_number')) >= keyws['tag_number']: | 122 | if match and int(match.group('tag_number')) >= keyws['tag_number']: |
@@ -182,8 +181,7 @@ def get_test_runs(log, repo, tag_name, **kwargs): | |||
182 | 181 | ||
183 | # Get a list of all matching tags | 182 | # Get a list of all matching tags |
184 | tag_pattern = tag_name.format(**str_fields) | 183 | tag_pattern = tag_name.format(**str_fields) |
185 | revs = repo.run_cmd(['ls-remote', '--refs', '--tags', 'origin', '-q', tag_pattern]).splitlines() | 184 | tags = repo.run_cmd(['tag', '-l', tag_pattern]).splitlines() |
186 | tags = ["".join(d.split()[1].split('/', 2)[2:]) for d in revs] | ||
187 | log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) | 185 | log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) |
188 | 186 | ||
189 | # Parse undefined fields from tag names | 187 | # Parse undefined fields from tag names |