From c4f83aa58cef67b1ff436422b9c4e69844d0e6b4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Sep 2023 21:31:54 +0100 Subject: oeqa/utils/gitarchive: Handle broken commit counts in results repo The test results repository contains tags like: master/64501-g65c94ca3196e5ef3344a469fea8e30444f2e967a/0 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/3 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/2 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/1 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/0 where the commit count is correct in one case and not in the others. This causes assertion errors in the current code. Add in some code to work around these historical issues where the commit counts are low. (From OE-Core rev: 27c1ad02b9479f30ad8eacdee1cdad79cab5269d) Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit d51fc5c8c469730885af7bbde7122032de411d89) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/gitarchive.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'meta/lib/oeqa/utils/gitarchive.py') diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 73beafecb5..6046f183d5 100644 --- a/meta/lib/oeqa/utils/gitarchive.py +++ b/meta/lib/oeqa/utils/gitarchive.py @@ -221,7 +221,15 @@ def get_test_revs(log, repo, tag_name, **kwargs): if not commit in revs: revs[commit] = TestedRev(commit, commit_num, [tag]) else: - assert commit_num == revs[commit].commit_number, "Commit numbers do not match" + if commit_num != revs[commit].commit_number: + # Historically we have incorrect commit counts of '1' in the repo so fix these up + if int(revs[commit].commit_number) < 5: + tags = revs[commit].tags + revs[commit] = TestedRev(commit, commit_num, [tags]) + elif int(commit_num) < 5: + pass + else: + sys.exit("Commit numbers for commit %s don't match (%s vs %s)" % (commit, commit_num, revs[commit].commit_number)) revs[commit].tags.append(tag) # Return in sorted table -- cgit v1.2.3-54-g00ecf