Merge "Change stackforge to openstack"
diff --git a/requirements.txt b/requirements.txt
index cff7fd8..813008a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
gear>=0.5.4,<1.0.0
python-swiftclient
python-keystoneclient
-argparse
lockfile
python-daemon<2.0
diff --git a/tools/zuul_enqueue.py b/tools/zuul_enqueue.py
index ad9e653..8236606 100755
--- a/tools/zuul_enqueue.py
+++ b/tools/zuul_enqueue.py
@@ -9,8 +9,10 @@
# Set the user to watch
user = 'turbo-hipster'
author_name = 'DB Datasets CI'
+author_account_id = 9578
upstream_user = 'jenkins'
upstream_author_name = "Jenkins"
+upstream_author_account_id = 3
# Grab a list of missing or negative reviews for a user:
url = ("https://review.openstack.org/changes/?q=status:open "
@@ -38,10 +40,12 @@
if message['_revision_number'] < patchset:
# Finished looking at all the messages on this patchset
break
- if not last_message and message['author']['name'] == author_name:
+ if (not last_message and
+ message['author']['_account_id'] == author_account_id):
last_message = message['message']
if (not last_upstream_message and
- message['author']['name'] == upstream_author_name):
+ message['author']['_account_id'] ==
+ upstream_author_account_id):
last_upstream_message = message['message']
if (last_upstream_message and