zuul/zuul
Code Issues Proposed changes

Allow for projects only names in zuul-migrate

Browse Source 
It is possible for a project not to have a '/' in its name, add
support for it.

Change-Id: Ic773da4ec552a55c8b647fb38e54e300368d8be1
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2018-05-29 13:14:49 -04:00
parent bfa8bd0b5b
commit 9b06ea20b8
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zuul/cmd/migrate.py
View File

@@ -153,7 +153,9 @@ def extract_projects(data):
def expand_project_names(required, full):
projects = []
for name in full:
org, repo = name.split('/')
repo = name
if '/' in name:
org, repo = name.split('/')
if repo in required or name in required:
projects.append(name)
return projects
@@ -1471,8 +1473,10 @@ class ZuulMigrate:
if not orig_name:
jobs.append(job)
continue
orig_name = orig_name.format(
name=project['name'].split('/')[1])
project_name = project['name']
if '/' in project['name']:
project_name = project['name'].split('/')[1]
orig_name = orig_name.format(name=project_name)
info = {}
for layout_job in self.mapping.layout.get('jobs', []):
if 'parameter-function' in layout_job:
@@ -1615,7 +1619,10 @@ class ZuulMigrate:
if not orig_name:
self.log.error("Job without old name: %s", new_job_name)
continue
orig_name = orig_name.format(name=project['name'].split('/')[1])
project_name = project['name']
if '/' in project['name']:
project_name = project['name'].split('/')[1]
orig_name = orig_name.format(name=project_name)
for layout_job in self.mapping.layout.get('jobs', []):
if 'parameter-function' in layout_job: