The gitarchive() function takes a `push` parameter than can be either a boolean or a string. But this parameter is then passed to expand_tag_strings(), which clearly expect it to be a string if it is defined. Split this in two arguments: a `push` boolean value and a `push_remote` optional string.
Signed-off-by: Mathieu Dubois-Briand <[email protected]> --- meta/lib/oeqa/selftest/cases/gitarchivetests.py | 4 ++-- meta/lib/oeqa/utils/gitarchive.py | 8 ++++---- scripts/lib/resulttool/store.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/gitarchivetests.py b/meta/lib/oeqa/selftest/cases/gitarchivetests.py index 71382089c124..dcf0eb3be569 100644 --- a/meta/lib/oeqa/selftest/cases/gitarchivetests.py +++ b/meta/lib/oeqa/selftest/cases/gitarchivetests.py @@ -74,7 +74,7 @@ class GitArchiveTests(OESelftestTestCase): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - [], [], False, keywords, logger) + [], [], False, None, keywords, logger) self.assertTrue(tag_exists(git_obj, target_tag), msg=f"Tag {target_tag} has not been created") delete_fake_repository(path) @@ -88,7 +88,7 @@ class GitArchiveTests(OESelftestTestCase): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - [], [], False, keywords, logger) + [], [], False, None, keywords, logger) self.assertTrue(tag_exists(git_obj, second_tag), msg=f"Second tag {second_tag} has not been created") delete_fake_repository(path) diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 7e1d5057482f..6ec17d36958c 100644 --- a/meta/lib/oeqa/utils/gitarchive.py +++ b/meta/lib/oeqa/utils/gitarchive.py @@ -162,7 +162,7 @@ def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern, msg_body = format_str(msg_body_pattern, keyws) return tag_name, msg_subj + '\n\n' + msg_body -def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_msg_body, branch_name, no_tag, tagname, tag_msg_subject, tag_msg_body, exclude, notes, push, keywords, log): +def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_msg_body, branch_name, no_tag, tagname, tag_msg_subject, tag_msg_body, exclude, notes, push, push_remote, keywords, log): if not os.path.isdir(data_dir): raise ArchiveError("Not a directory: {}".format(data_dir)) @@ -179,7 +179,7 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms tag_name, tag_msg = expand_tag_strings(data_repo, tagname, tag_msg_subject, tag_msg_body, - push, log, keywords) + push_remote, log, keywords) # Commit data commit = git_commit_data(data_repo, data_dir, branch_name, @@ -195,10 +195,10 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms cmd = ['push', '--tags'] # If no remote is given we push with the default settings from # gitconfig - if push is not True: + if push_remote is not None: notes_refs = ['refs/notes/' + ref.format(branch_name=branch_name) for ref, _ in notes] - cmd.extend([push, branch_name] + notes_refs) + cmd.extend([push_remote, branch_name] + notes_refs) log.info("Pushing data to remote") data_repo.run_cmd(cmd) diff --git a/scripts/lib/resulttool/store.py b/scripts/lib/resulttool/store.py index b143334e699d..f3caafaff822 100644 --- a/scripts/lib/resulttool/store.py +++ b/scripts/lib/resulttool/store.py @@ -82,7 +82,7 @@ def store(args, logger): "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", False, "{branch}/{commit_count}-g{commit}/{tag_number}", 'Test run #{tag_number} of {branch}:{commit}', '', - excludes, [], False, keywords, logger) + excludes, [], False, None, keywords, logger) if args.logfile_archive: logdir = args.logfile_archive + "/" + tagname -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229079): https://lists.openembedded.org/g/openembedded-core/message/229079 Mute This Topic: https://lists.openembedded.org/mt/117152995/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
