zuul
/
zuul
Code Issues Proposed changes

Merge "Add support for puppet-openstack-integration based jobs" into feature/zuulv3

This commit is contained in:
Zuul 2017-09-22 16:33:08 +00:00 committed by Gerrit Code Review
parent 18b6500f7d db65501762
commit d778600524
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zuul/cmd/migrate.py
View File

@ -809,8 +809,22 @@ class Job:
project_names=[]):
output = collections.OrderedDict()
output['name'] = self.name
expanded_projects = []
if self.required_projects:
expanded_projects = expand_project_names(
self.required_projects, project_names)
# Look for project names in the job name. Lookie there - the
# python in operator works on lists and strings.
expanded_projects.extend(expand_project_names(
self.name, project_names))
if 'dsvm' in self.name:
output['parent'] = 'legacy-dsvm-base'
elif 'puppet-openstack-integration' in self.name:
output['parent'] = 'legacy-puppet-openstack-integration'
elif 'openstack/puppet-openstack-integration' in expanded_projects:
output['parent'] = 'legacy-puppet-openstack-integration'
elif has_artifacts:
output['parent'] = 'publish-openstack-artifacts'
elif has_draft:
@ -829,13 +843,7 @@ class Job:
if self.nodes:
output['nodes'] = self.getNodes()
if self.required_projects:
expanded_projects = expand_project_names(
self.required_projects, project_names)
# Look for project names in the job name. Lookie there - the
# python in operator works on lists and strings.
expanded_projects.extend(expand_project_names(
self.name, project_names))
if expanded_projects:
output['required-projects'] = list(set(expanded_projects))
return output