jenkins-bot has submitted this change and it was merged.
Change subject: Expand email regex
......................................................................
Expand email regex
Use the verbose flag to gain some whitespace.
Here's a script to test the change, it should print "True" twice.
import re
import yaml
data = yaml.safe_load(open("layout.yaml", "r"))
email_pat = data["pipelines"][0]["trigger"]["gerrit"][0]["email"][0]
print (re.match(email_pat, "[email protected]") is None)
print (re.match(email_pat, "[email protected]") is not None)
Change-Id: I6bebba5c69a46e5c941a940f3acd58901bced8d0
---
M zuul/layout.yaml
1 file changed, 116 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cf74fb8..dea0079 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -35,11 +35,125 @@
gerrit:
- event: patchset-created
# Don't run the check pipeline if the user is allowed to run the
test pipeline (bug 43391).
- # TODO: Figure out a way to turn this into a list instead of a
single-line regex.
+ # TODO: Figure out a way to turn this into a list instead of a
single regex.
# TODO: Figure out a way to not have to repeat this from pipeline
'test'.
# This email filter and the one for 'test' can be removed once we
have fixed bug 45499.
email:
- -
^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|sucheta\.ghoshal@gmail\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|git@samsmith\.io|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@nichework\.com|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@gmail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|marielle\.volz@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|twkozlowski@gmail\.com|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net|at\.light@live\.com\.au|jackmcbarn@gmail\.com|platonides@gmail\.com|jarry1250@gmail\.com|admin@alphacorp\.tk|01tonythomas@gmail\.com|benapetr@gmail\.com|pastakhov@yandex\.ru|hardikjuneja\.hj@gmail\.com|siebrand@kitano\.nl|wctaiwan@gmail\.com|ladsgroup@gmail\.com|info@gno\.de|v\.a\.ghaisas@gmail\.com|valhallasw@arctus\.nl|zhorishna@gmail\.com|jayvdb@gmail\.com|skizzerz@gmail\.com|jan\.wikimedia@zerebecki\.de|rillke@wikipedia\.de|mwalker@khaosdev\.com|se4598@gmx\.de|oliver\.buchtala@gmail\.com|florian\.schmidt\.welzow@t-online\.de|johnflewis93@gmail\.com|jeff\.janes@gmail\.com|CommodoreFabianus@gmx\.de|admin@glados\.cc|adamr_carter@btinternet\.com|alexsh@mail2000\.com\.tw|dr\.trigon@surfeu\.ch|maarten@mdammers\.nl|malafaya@clix\.pt|mpaa\.wiki@gmail\.com|nullzero\.free@gmail\.com|pyfisch@gmail\.com|ricordisamoa@openmailbox\.org|russblau@imapmail\.org|wiki@strainu\.ro|wikiposta@gmail\.com)).*$
+ - |
+ (?x) ^(?!(
+ .*?@wikimedia\.org
+ | .*?@wikimedia\.de
+ | l10n-bot@translatewiki\.net
+ | anomie\.wikipedia@gmail\.com
+ | amir\.aharoni@mail\.huji\.ac\.il
+ | hashar@free\.fr
+ | jeroendedauw@gmail\.com
+ | maxsem\.wiki@gmail\.com
+ | mtraceur@member\.fsf\.org
+ | niklas\.laxstrom@gmail\.com
+ | santhosh\.thottingal@gmail\.com
+ | s\.mazeland@xs4all\.nl
+ | stefan\.petrea@gmail\.com
+ | stefan@garage-coding\.com
+ | sucheta\.ghoshal@gmail\.com
+ | roan\.kattouw@gmail\.com
+ | krinklemail@gmail\.com
+ | trevorparscal@gmail\.com
+ | inez@wikia-inc\.com
+ | orbit@framezero\.com
+ | david@sheetmusic\.org\.uk
+ | git@samsmith\.io
+ | glaser@hallowelt\.biz
+ | aude\.wiki@gmail\.com
+ | bawolff\+wn@gmail\.com
+ | bryan\.tongminh@gmail\.com
+ | dereckson@espace-win\.org
+ | hartman\.wiki@gmail\.com
+ | hoo@online\.de
+ | codereview@emsenhuber\.ch
+ | daniel@nadir-seen-fire\.com
+ | jamesin\.hongkong\.1@gmail\.com
+ | krenair@gmail\.com
+ | liangent@gmail\.com
+ | mah@nichework\.com
+ | matma\.rex@gmail\.com
+ | raimond\.spekking@gmail\.com
+ | robinp\.1273@gmail\.com
+ | tim@tim-landscheidt\.de
+ | tylerromeo@gmail\.com
+ | umherirrender_de\.wp@web\.de
+ | yuriastrakhan@gmail\.com
+ | yaron57@gmail\.com
+ | markus@semantic-mediawiki\.org
+ | s7eph4n@gmail\.org
+ | wiki@physikerwelt\.de
+ | addshorewiki@gmail\.com
+ | pragun06@gmail\.com
+ | nilesh@nileshc\.com
+ | benestar\.wikimedia@gmail\.com
+ | mlazowik@gmail\.com
+ | pleasestand@live\.com
+ | legoktm\.wikipedia@gmail\.com
+ | marielle\.volz@gmail\.com
+ | moriel@gmail\.com
+ | d_entous@yahoo\.com
+ | kartik\.mistry@gmail\.com
+ | drenfro@vistaprint\.com
+ | matanya\.moses@gmail\.com
+ | matanya@foss\.co\.il
+ | andrew\.green\.df@gmail\.com
+ | thomaspt@hotmail\.fr
+ | twkozlowski@gmail\.com
+ | yuvipanda@gmail\.com
+ | aarcos\.wiki@gmail\.com
+ | saper@saper\.info
+ | christian@quelltextlich\.at
+ | maria\.pacana@gmail\.com
+ | bebirchall@gmail\.com
+ | shahyar@gmail\.com
+ | federicoleva@tiscali\.it
+ | jack@countervandalism\.net
+ | at\.light@live\.com\.au
+ | jackmcbarn@gmail\.com
+ | platonides@gmail\.com
+ | jarry1250@gmail\.com
+ | admin@alphacorp\.tk
+ | 01tonythomas@gmail\.com
+ | benapetr@gmail\.com
+ | pastakhov@yandex\.ru
+ | hardikjuneja\.hj@gmail\.com
+ | siebrand@kitano\.nl
+ | wctaiwan@gmail\.com
+ | ladsgroup@gmail\.com
+ | info@gno\.de
+ | v\.a\.ghaisas@gmail\.com
+ | valhallasw@arctus\.nl
+ | zhorishna@gmail\.com
+ | jayvdb@gmail\.com
+ | skizzerz@gmail\.com
+ | jan\.wikimedia@zerebecki\.de
+ | rillke@wikipedia\.de
+ | mwalker@khaosdev\.com
+ | se4598@gmx\.de
+ | oliver\.buchtala@gmail\.com
+ | florian\.schmidt\.welzow@t-online\.de
+ | johnflewis93@gmail\.com
+ | jeff\.janes@gmail\.com
+ | CommodoreFabianus@gmx\.de
+ | admin@glados\.cc
+ | adamr_carter@btinternet\.com
+ | alexsh@mail2000\.com\.tw
+ | dr\.trigon@surfeu\.ch
+ | maarten@mdammers\.nl
+ | malafaya@clix\.pt
+ | mpaa\.wiki@gmail\.com
+ | nullzero\.free@gmail\.com
+ | pyfisch@gmail\.com
+ | ricordisamoa@openmailbox\.org
+ | russblau@imapmail\.org
+ | wiki@strainu\.ro
+ | wikiposta@gmail\.com
+ )).*$
success-message: 'Basic test build succeeded.'
success:
--
To view, visit https://gerrit.wikimedia.org/r/194993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bebba5c69a46e5c941a940f3acd58901bced8d0
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
