Merge pull request #883 from jberry-suse/devel-super-not-ready-merge

request_splitter: should merge: allow devel and super if not ready.
This commit is contained in:
Ludwig Nussel 2017-05-09 17:40:43 +02:00 committed by GitHub
commit a2842357cf

View File

@ -177,6 +177,12 @@ class RequestSplitter(object):
return len(pseudometa['requests']) > 0 and 'splitter_info' in pseudometa
def should_staging_merge(self, status, pseudometa):
if (pseudometa['splitter_info']['strategy']['name'] in ('devel', 'super') and
status['overall_state'] not in ('acceptable', 'review')):
# Simplistic attempt to allow for followup requests to be staged
# after age max has been passed while still stopping when ready.
return True
if 'activated' not in pseudometa['splitter_info']:
# No information on the age of the staging.
return False