From ab08ae3c7a98504f975c56da06aae90bd50dded1 Mon Sep 17 00:00:00 2001 From: Guillaume Chauvel Date: Wed, 29 Apr 2020 09:18:18 +0200 Subject: [PATCH] Fix quickstart gating, Add git name and email to executor When using quickstart tutorial to test gating, a merge commit cannot be created because git user.name and user.email are not set Change-Id: I62df8839e9637c10d3fd656cf6a3cb02cae40af1 Story: 2007603 Task: 39586 --- zuul/merger/server.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zuul/merger/server.py b/zuul/merger/server.py index f03efdcf78..9c18b20f4a 100644 --- a/zuul/merger/server.py +++ b/zuul/merger/server.py @@ -50,8 +50,10 @@ class BaseMergeServer(metaclass=ABCMeta): def __init__(self, config, component, connections=None): self.connections = connections or {} - self.merge_email = get_default(config, 'merger', 'git_user_email') - self.merge_name = get_default(config, 'merger', 'git_user_name') + self.merge_email = get_default(config, 'merger', 'git_user_email', + 'zuul.merger.default@example.com') + self.merge_name = get_default(config, 'merger', 'git_user_name', + 'Zuul Merger Default') self.merge_speed_limit = get_default( config, 'merger', 'git_http_low_speed_limit', '1000') self.merge_speed_time = get_default(