Merge "executor: Fix 'merge_jobs' configuration"

This commit is contained in:
Zuul 2020-06-10 22:03:30 +00:00 committed by Gerrit Code Review
commit cc36f2755b
1 changed files with 2 additions and 1 deletions

View File

@ -2650,7 +2650,8 @@ class ExecutorServer(BaseMergeServer):
self.ansible_manager.install()
self.ansible_manager.copyAnsibleFiles()
self.process_merge_jobs = self.config, 'executor', 'merge_jobs', True
self.process_merge_jobs = get_default(self.config, 'executor',
'merge_jobs', True)
function_name = 'executor:execute'
if self.zone: