From 393caa5596ae03edcbf0ffa07517955bb44d0e98 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 6 Feb 2018 21:39:36 +0000 Subject: [PATCH] Stop excluding bot accounts There is no longer any need to explicitly exclude accounts used by review automation, as they don't have OpenStack Foundation Individual Memberships and so won't be included in the rolls anyway. Change-Id: If0362075c4fdf404fe89877d02926291c7a81d9f --- openstack_election/cmds/generate_rolls.py | 11 ++--------- openstack_election/owners.py | 7 +++---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/openstack_election/cmds/generate_rolls.py b/openstack_election/cmds/generate_rolls.py index 62a3056b..3bf1e0c0 100755 --- a/openstack_election/cmds/generate_rolls.py +++ b/openstack_election/cmds/generate_rolls.py @@ -28,13 +28,6 @@ from six.moves.urllib.request import urlopen from openstack_election import owners from openstack_election import utils -# Exclude the system / bot accounts -# OpenStack Release Bot: -# curl https://review.openstack.org/accounts/22816 -# OpenStack Proposal Bot -# curl https://review.openstack.org/accounts/11131 -MINUS_BOT_ACCOUNTS = ["-i", "11131", "-i", "22816"] - def main(): start = utils.conf['timeframe']['start'] @@ -72,7 +65,7 @@ def main(): os.chdir(os.path.dirname(args.rolls_dir)) print("Starting roll generation @%s" % time.ctime()) owners.main(["owners.py", "-a", args.after, "-b", args.before, - "-o", args.tag, "-r", args.tag] + MINUS_BOT_ACCOUNTS) + "-o", args.tag, "-r", args.tag]) print("Finished roll generation @%s" % time.ctime()) if args.with_stable: @@ -80,7 +73,7 @@ def main(): print("Starting (Stable) roll generation @%s" % time.ctime()) owners.main(["owners.py", "-a", args.after, "-b", args.before, "-o", tmp_dir, "-r", args.tag, "-n", - "-s", "branch:^stable/.*"] + MINUS_BOT_ACCOUNTS) + "-s", "branch:^stable/.*"]) print("Finished (Stable) roll generation @%s" % time.ctime()) shutil.copy("%s/_electorate.txt" % tmp_dir, "./%s/stable_branch_maintenance.txt" % args.tag) diff --git a/openstack_election/owners.py b/openstack_election/owners.py index 50e0a194..88ba8e36 100644 --- a/openstack_election/owners.py +++ b/openstack_election/owners.py @@ -40,8 +40,7 @@ # $ ./venv/bin/pip install pyyaml requests # [...] # $ ./venv/bin/python tools/owners.py -a 2015-03-04 \ -# -b 2016-03-04 -i 11131 -i 22816 -o owners \ -# -r march-2016-elections +# -b 2016-03-04 -o owners -r march-2016-elections # MISSING: ansible-build-image # MERGING DUPLICATE ACCOUNT: 8074 into 2467 # [...blah, blah, blah...wait for completion...] @@ -53,8 +52,8 @@ # the full electorate over like: # # $ ./venv/bin/python tools/owners.py -a 2015-03-04 \ -# -b 2016-03-04 -i 11131 -i 22816 -o sbm \ -# -r march-2016-elections -n -s 'branch:^stable/.*' +# -b 2016-03-04 -o sbm -r march-2016-elections \ +# -n -s 'branch:^stable/.*' # [...wait for completion again...] # $ cp sbm/_electorate.txt owners/stable_branch_maintenance.txt # $ cp sbm/_all_owners.yaml owners/stable_branch_maintenance.yaml