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
This commit is contained in:
Guillaume Chauvel 2020-04-29 09:18:18 +02:00
parent ba94d07e8a
commit ab08ae3c7a
1 changed files with 4 additions and 2 deletions

View File

@ -50,8 +50,10 @@ class BaseMergeServer(metaclass=ABCMeta):
def __init__(self, config, component, connections=None): def __init__(self, config, component, connections=None):
self.connections = connections or {} self.connections = connections or {}
self.merge_email = get_default(config, 'merger', 'git_user_email') self.merge_email = get_default(config, 'merger', 'git_user_email',
self.merge_name = get_default(config, 'merger', 'git_user_name') 'zuul.merger.default@example.com')
self.merge_name = get_default(config, 'merger', 'git_user_name',
'Zuul Merger Default')
self.merge_speed_limit = get_default( self.merge_speed_limit = get_default(
config, 'merger', 'git_http_low_speed_limit', '1000') config, 'merger', 'git_http_low_speed_limit', '1000')
self.merge_speed_time = get_default( self.merge_speed_time = get_default(