Remove email-filter requirement

This option was deprecated.

Change-Id: Idd19278e22b3168dcd545901b8ca8bacb7599647

doc/source/user/config.rst

@@ -263,11 +263,6 @@ success, the pipeline reports back to Gerrit with a *Verified* vote of
              If present, an approval with this email address is required.  It
              is treated as a regular expression.
 
-          .. zuul:attr:: email-filter (deprecated)
-
-             A deprecated alternate spelling of *email*.  Only one of
-             *email* or *email_filter* should be used.
-
           .. zuul:attr:: older-than
 
              If present, the approval must be older than this amount

zuul/configloader.py

@@ -763,7 +763,6 @@ class PipelineParser(object):
         precedence = vs.Any('normal', 'low', 'high')
 
         approval = vs.Schema({'username': str,
-                              'email-filter': str,
                               'email': str,
                               'older-than': str,
                               'newer-than': str,

zuul/driver/gerrit/gerritmodel.py

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

zuul/driver/gerrit/gerritsource.py

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

zuul/driver/gerrit/gerrittrigger.py

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

zuul/driver/zuul/zuultrigger.py

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