openstack/project-config
Code Issues Proposed changes

Merge "process branch locations based on input data not name prefix"

Browse Source
This commit is contained in:
Jenkins
2017-05-30 18:28:48 +00:00
committed by Gerrit Code Review
parent 0d94c41a35 7fe02eb9cb
commit 96df980d5d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jenkins/scripts/release-tools/list_deliverable_branches.py
View File

@@ -74,17 +74,18 @@ def get_modified_deliverable_file_content(reporoot, filenames):
} }
for branch in deliverable_data.get('branches', []): for branch in deliverable_data.get('branches', []):
branch_type = branch['name'].split('/')[0]
location = branch['location'] location = branch['location']
if branch_type == 'stable': if isinstance(location, dict):
for proj in releases_by_version[location]['projects']:
yield (proj['repo'], branch['name'], branch['location'])
else:
for repo, sha in sorted(location.items()): for repo, sha in sorted(location.items()):
yield (repo, branch['name'], sha) yield (repo, branch['name'], sha)
else:
# Assume a single location string that is a valid
# reference in the git repository.
for proj in releases_by_version[location]['projects']:
yield (proj['repo'], branch['name'], branch['location'])
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()