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

Merge pull request #1343 from jberry-suse/request_splitter-quick-rework

Browse Source 
osclib/request_splitter: rework quick strategy to handle Leap 15.0 workflow
This commit is contained in:
Ludwig Nussel 2018-01-15 14:57:28 +01:00 committed by GitHub
commit e938219c2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osclib/request_splitter.py
View File

@ -3,6 +3,7 @@ import dateutil.parser
import hashlib
from lxml import etree as ET
from osc import conf
from osc.core import show_project_meta
import re
class RequestSplitter(object):
@ -476,8 +477,37 @@ class StrategySuper(StrategyDevel):
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"]')
splitter.filter_add('not(./review[not(@by_user="leaper" or @by_group="factory-staging")])')
# No @by_project reviews that are not accepted. If not first round stage
# this should also ignore previous staging project reviews or already
# accepted human reviews.
splitter.filter_add('not(./review[@by_project and @state!="accepted"])')
# Only allow reviews by whitelisted groups and users as all others will
# be considered non-quick (like @by_group="legal-auto"). The allowed
# groups are only those configured as reviewers on the target project.
meta = ET.fromstring(''.join(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
# contains is used, but the attribute must be asserted first since
# concat() loses that requirement.
allowed = ' ' + ' '.join(allowed) + ' '
splitter.filter_add(
# Assert that no(non-whitelisted and not accepted) review is found.
'not(./review[@{attribute} and '
'not(contains("{allowed}", concat(" ", @{attribute}, " "))) and '
'@state!="accepted"])'.format(attribute=attribute, allowed=allowed))
class StrategySpecial(StrategyNone):
PACKAGES = [