diff --git a/osclib/request_splitter.py b/osclib/request_splitter.py index 837ec7e0..e79c1a61 100644 --- a/osclib/request_splitter.py +++ b/osclib/request_splitter.py @@ -476,8 +476,8 @@ class StrategyQuick(StrategyNone): def apply(self, splitter): super(StrategyQuick, self).apply(splitter) - # Leaper accepted which means any extra reviews have been added. - splitter.filter_add('./review[@by_user="leaper" and @state="accepted"]') + # Origin manager accepted which means any extra reviews have been added. + splitter.filter_add('./review[@by_user="origin-manager" and @state="accepted"]') # No @by_project reviews that are not accepted. If not first round stage # this should also ignore previous staging project reviews or already @@ -489,12 +489,7 @@ class StrategyQuick(StrategyNone): # groups are only those configured as reviewers on the target project. meta = ET.fromstringlist(show_project_meta(splitter.api.apiurl, splitter.api.project)) allowed_groups = meta.xpath('group[@role="reviewer"]/@groupid') - allowed_users = [] - if 'repo-checker' in splitter.config: - allowed_users.append(splitter.config['repo-checker']) - self.filter_review_whitelist(splitter, 'by_group', allowed_groups) - self.filter_review_whitelist(splitter, 'by_user', allowed_users) def filter_review_whitelist(self, splitter, attribute, allowed): # Rather than generate a bunch of @attribute="allowed[0]" pairs