From 4df7c0fb4f85cc0210fda3a27666ea4ffa914494 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Tue, 18 Apr 2017 16:03:46 +1000 Subject: [PATCH] Revert "Make anne-bonny and bonnyci[bot] equivalent" This reverts commit 37a1db8c683779dfecda007e9efe3a9feaeb4543. This commit was useful in the transition to using github integrations but can be removed now that has finished. Change-Id: I5b2684c926d504effb5625217ffd0ea8873c16ca Signed-off-by: Jamie Lennox --- zuul/connection/github.py | 4 +--- zuul/trigger/github.py | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/zuul/connection/github.py b/zuul/connection/github.py index 7211e622e4..41052c1c37 100644 --- a/zuul/connection/github.py +++ b/zuul/connection/github.py @@ -322,9 +322,7 @@ def _status_as_tuple(self, status): if not creator: user = "Unknown" else: - user = creator.get('login', '') - - user = user.replace('anne-bonny', 'bonnyci[bot]') + user = creator.get('login') context = status.get('context') state = status.get('state') return (user, context, state) diff --git a/zuul/trigger/github.py b/zuul/trigger/github.py index 014dc2a98a..ab1d1d91fd 100644 --- a/zuul/trigger/github.py +++ b/zuul/trigger/github.py @@ -32,9 +32,6 @@ def toList(item): efilters = [] for trigger in toList(trigger_config): - statuses = [s.replace('anne-bonny', 'bonnyci[bot]') - for s in toList(trigger.get('status'))] - f = EventFilter( trigger=self, types=toList(trigger['event']), @@ -43,7 +40,7 @@ def toList(item): comments=toList(trigger.get('comment')), labels=toList(trigger.get('label')), states=toList(trigger.get('state')), - event_statuses=statuses + event_statuses=toList(trigger.get('status')) ) efilters.append(f)