Merge "relax ancestry rules for independent projects"

This commit is contained in:
Jenkins 2016-05-09 15:52:31 +00:00 committed by Gerrit Code Review
commit 0aa1d9eef3
2 changed files with 15 additions and 13 deletions
deliverables/_independent
openstack_releases/cmds

@ -91,15 +91,10 @@ releases:
projects:
- repo: openstack-dev/hacking
hash: e25679be7f3b9b2f2bbea6ce5af4fcd69ba2d574
# NOTE(sigmavirus24): Despite several tags not existing on master, this one
# prevents us from creating a 0.11.0 release. Fixing this edgecase in the
# release management software has been scheduled for Newton (see:
# https://etherpad.openstack.org/p/newton-relmgt-plan) For the moment,
# commenting out this release is the easiest way to side-step the issue.
# - version: 0.10.2
# - projects:
# - - repo: openstack-dev/hacking
# - hash: bc4b1118e155784bc306c01733375ffec56b89b3
- version: 0.10.2
projects:
- repo: openstack-dev/hacking
hash: bc4b1118e155784bc306c01733375ffec56b89b3
- version: 0.11.0
projects:
- repo: openstack-dev/hacking

@ -261,10 +261,17 @@ def main():
print('SHA found in descendants')
else:
print('SHA NOT FOUND in descendants')
errors.append(
'%s %s is not a descendant of %s' % (
project['repo'], project['hash'],
prev_version)
if series_name == '_independent':
save = warnings.append
else:
save = errors.append
save(
'%s %s receiving %s is not a descendant of %s' % (
project['repo'],
project['hash'],
release['version'],
prev_version,
)
)
prev_version = release['version']
prev_projects = set(p['repo'] for p in release['projects'])