openstack/releases
Code Issues Proposed changes

new-branch: Add check for branch name before adding

Browse Source 
If quickly scanning the command line arguments for the new-release
tool, it may not be obvious that --stable-branch is only needed
one time when initially creating the stable branch, not every time
doing a release off of a stable branch.

This adds a check to make sure the stable branch does not already
exist in the deliverable file before attempting to add the branch
directive for the current release.

Change-Id: Ib15aae2530eb9aebaad23d249dc3d59b022a6d46
This commit is contained in:
Sean McGinnis 2017-09-12 13:55:51 -06:00
parent 2bbfaecd97
commit eeeea1a37a
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openstack_releases/cmds/new_release.py
View File

@ -244,11 +244,24 @@ def main():
'version': new_version,
'projects': projects,
})
if add_stable_branch:
deliverable_info.setdefault('branches', []).append({
'name': 'stable/{}'.format(series),
'location': new_version,
})
branch_name = 'stable/{}'.format(series)
# First check if this branch is already defined
if 'branches' in deliverable_info:
for branch in deliverable_info['branches']:
if branch.get('name') == branch_name:
print('Branch {} already existes, skipping'.format(
branch_name))
add_stable_branch = False
break
if add_stable_branch:
deliverable_info.setdefault('branches', []).append({
'name': branch_name,
'location': new_version,
})
if changes > 0:
deliverable_filename = 'deliverables/%s/%s.yaml' % (