update propose-final-releases to work with object model classes

Change-Id: I652fd65bdbeab5f6522fa2982d70a7945198bda4
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-03-08 08:35:35 -05:00
parent 800ca844c2
commit 3ec867814f

View File

@ -153,34 +153,34 @@ def main():
continue continue
latest_release = deliv.releases[-1] latest_release = deliv.releases[-1]
projects = latest_release.get('projects') projects = latest_release.projects
if not projects: if not projects:
verbose('# no projects in latest release') verbose('# no projects in latest release')
continue continue
for pre_rel in ['a', 'b', 'rc']: for pre_rel in ['a', 'b', 'rc']:
if pre_rel in str(latest_release['version']): if pre_rel in str(latest_release.version):
break break
else: # we did not find any pre_rel else: # we did not find any pre_rel
verbose('# {} was not a release candidate'.format( verbose('# {} was not a release candidate'.format(
latest_release['version'])) latest_release.version))
continue continue
# The new version is the same as the latest release version # The new version is the same as the latest release version
# without the pre-release component at the end. Make sure it # without the pre-release component at the end. Make sure it
# has 3 sets of digits. # has 3 sets of digits.
new_version = '.'.join( new_version = '.'.join(
(latest_release['version'].split('.')[:-1] + ['0'])[:3] (latest_release.version.split('.')[:-1] + ['0'])[:3]
) )
branch = 'stable/{}'.format(args.prior_series) branch = 'stable/{}'.format(args.prior_series)
diff_start = get_prior_branch_point( diff_start = get_prior_branch_point(
workdir, projects[0]['repo'], branch, workdir, projects[0].repo.name, branch,
) )
deliverable_data = deliv.data deliverable_data = deliv.data
release_data = { release_data = {
'version': new_version, 'version': new_version,
'projects': latest_release['projects'], 'projects': deliv.data['releases'][-1]['projects'],
} }
if diff_start: if diff_start:
release_data['diff-start'] = diff_start release_data['diff-start'] = diff_start