From c78d98f9e68bb7870e09f76f465fc80534dd2aed Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Thu, 4 May 2017 16:48:57 -0500 Subject: [PATCH] request_splitter: should merge: allow devel and super if not ready. --- osclib/request_splitter.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/osclib/request_splitter.py b/osclib/request_splitter.py index 5692e043..4363b071 100644 --- a/osclib/request_splitter.py +++ b/osclib/request_splitter.py @@ -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