Merge "Migrate node information to nodeset instead of nodes" into feature/zuulv3

This commit is contained in:
Zuul 2017-09-22 17:27:37 +00:00 committed by Gerrit Code Review
commit c8ee8a571a
1 changed files with 4 additions and 1 deletions

View File

@ -841,7 +841,10 @@ class Job:
output['vars']['BUILD_TIMEOUT'] = str(timeout * 1000)
if self.nodes:
output['nodes'] = self.getNodes()
if len(self.nodes) == 1:
output['nodeset'] = self.getNodes()[0]
else:
output['nodeset'] = dict(nodes=self.getNodes())
if expanded_projects:
output['required-projects'] = list(set(expanded_projects))