Remove email-filter requirement

This option was deprecated.

Change-Id: Idd19278e22b3168dcd545901b8ca8bacb7599647
This commit is contained in:
James E. Blair
2017-07-26 15:07:11 -07:00
parent 9fd98ab08b
commit 6cfb9b6826
6 changed files with 1 additions and 12 deletions

View File

@@ -71,14 +71,12 @@ class GerritApprovalFilter(object):
for k, v in a.items():
if k == 'username':
a['username'] = re.compile(v)
elif k in ['email', 'email-filter']:
elif k == 'email':
a['email'] = re.compile(v)
elif k == 'newer-than':
a[k] = time_to_seconds(v)
elif k == 'older-than':
a[k] = time_to_seconds(v)
if 'email-filter' in a:
del a['email-filter']
return approvals
def _match_approval_required_approval(self, rapproval, approval):

View File

@@ -82,7 +82,6 @@ class GerritSource(BaseSource):
approval = vs.Schema({'username': str,
'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,

View File

@@ -77,7 +77,6 @@ def getSchema():
variable_dict = v.Schema(dict)
approval = v.Schema({'username': str,
'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,

View File

@@ -44,7 +44,6 @@ class ZuulTrigger(BaseTrigger):
def getSchema():
approval = v.Schema({'username': str,
'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,