yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1345 from jberry-suse/obs_clone-link

Browse Source 
obs_clone: handle project links, clone rings, reword workaround comment.
This commit is contained in:
Ludwig Nussel 2018-01-15 14:58:08 +01:00 committed by GitHub
commit 2da79816c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
obs_clone.py
View File

@ -68,7 +68,11 @@ def users_clone(apiurl_source, apiurl_target, entity):
path = ['group', group.get('groupid')] path = ['group', group.get('groupid')]
entity_clone(apiurl_source, apiurl_target, path, clone=group_clone) entity_clone(apiurl_source, apiurl_target, path, clone=group_clone)
def project_repositories_remove(project): def project_references_remove(project):
# Remove links that reference other projects.
for link in project.xpath('link[@project]'):
link.getparent().remove(link)
# Remove repositories that reference other projects. # Remove repositories that reference other projects.
for repository in project.xpath('repository[releasetarget or path]'): for repository in project.xpath('repository[releasetarget or path]'):
repository.getparent().remove(repository) repository.getparent().remove(repository)
@ -89,9 +93,18 @@ def project_clone(apiurl_source, apiurl_target, project):
# Write stripped version that does not include repos with path references. # Write stripped version that does not include repos with path references.
url = makeurl(apiurl_target, ['source', project.get('name'), '_meta']) url = makeurl(apiurl_target, ['source', project.get('name'), '_meta'])
stripped = deepcopy(project) stripped = deepcopy(project)
project_repositories_remove(stripped) project_references_remove(stripped)
http_PUT(url, data=ET.tostring(stripped)) http_PUT(url, data=ET.tostring(stripped))
for link in project.xpath('link[@project]'):
if not project_fence(link.get('project')):
project.remove(link)
break
# Valid reference to project and thus should be cloned.
path = ['source', link.get('project'), '_meta']
entity_clone(apiurl_source, apiurl_target, path, clone=project_clone)
# Clone projects referenced in repository paths. # Clone projects referenced in repository paths.
for repository in project.findall('repository'): for repository in project.findall('repository'):
for target in repository.xpath('./path') + repository.xpath('./releasetarget'): for target in repository.xpath('./path') + repository.xpath('./releasetarget'):
@ -105,7 +118,9 @@ def project_clone(apiurl_source, apiurl_target, project):
def project_workaround(project): def project_workaround(project):
if project.get('name') == 'openSUSE:Factory': if project.get('name') == 'openSUSE:Factory':
# TODO #1335: temporary scariness from from revision 429. # See #1335 for details about temporary workaround in revision 429, but
# suffice it to say that over-complicates clone with multiple loops and
# may be introduced from time to time when Factory repo is hosed.
scariness = project.xpath('repository[@name="standard"]/path[contains(@project, ":0-Bootstrap")]') scariness = project.xpath('repository[@name="standard"]/path[contains(@project, ":0-Bootstrap")]')
if len(scariness): if len(scariness):
scariness[0].getparent().remove(scariness[0]) scariness[0].getparent().remove(scariness[0])
@ -151,6 +166,14 @@ def clone_do(apiurl_source, apiurl_target, project):
try: try:
# TODO Decide how to choose what to clone via args. # TODO Decide how to choose what to clone via args.
# Rather than handle the self-referencing craziness with a proper solver
# the leaf can simple be used to start the chain and works as desired.
# Disable this when running clone repeatedly during developing as the
# projects cannot be cleanly re-created without more work.
entity_clone(apiurl_source, apiurl_target, ['source', project + ':Rings:2-TestDVD', '_meta'],
clone=project_clone)
entity_clone(apiurl_source, apiurl_target, ['source', project + ':Staging', 'dashboard', '_meta'], entity_clone(apiurl_source, apiurl_target, ['source', project + ':Staging', 'dashboard', '_meta'],
clone=package_clone, after=package_clone_after) clone=package_clone, after=package_clone_after)