yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2155 from jberry-suse/request-splitter-quick-update

Browse Source 
osclib/request_splitter: update quick strategy for origin-manager and staging checks
This commit is contained in:
Jimmy Berry 2019-08-13 17:25:09 -05:00 committed by GitHub
commit 1e238223ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osclib/request_splitter.py
View File

@ -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