openstack/election
Code Issues Proposed changes

Stop excluding bot accounts

Browse Source 
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
This commit is contained in:
Jeremy Stanley 2018-02-06 21:39:36 +00:00
parent f7a1ff8873
commit 393caa5596
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack_election/cmds/generate_rolls.py
View File

@ -28,13 +28,6 @@ from six.moves.urllib.request import urlopen
from openstack_election import owners from openstack_election import owners
from openstack_election import utils 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(): def main():
start = utils.conf['timeframe']['start'] start = utils.conf['timeframe']['start']
@ -72,7 +65,7 @@ def main():
os.chdir(os.path.dirname(args.rolls_dir)) os.chdir(os.path.dirname(args.rolls_dir))
print("Starting roll generation @%s" % time.ctime()) print("Starting roll generation @%s" % time.ctime())
owners.main(["owners.py", "-a", args.after, "-b", args.before, 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()) print("Finished roll generation @%s" % time.ctime())
if args.with_stable: if args.with_stable:
@ -80,7 +73,7 @@ def main():
print("Starting (Stable) roll generation @%s" % time.ctime()) print("Starting (Stable) roll generation @%s" % time.ctime())
owners.main(["owners.py", "-a", args.after, "-b", args.before, owners.main(["owners.py", "-a", args.after, "-b", args.before,
"-o", tmp_dir, "-r", args.tag, "-n", "-o", tmp_dir, "-r", args.tag, "-n",
"-s", "branch:^stable/.*"] + MINUS_BOT_ACCOUNTS) "-s", "branch:^stable/.*"])
print("Finished (Stable) roll generation @%s" % time.ctime()) print("Finished (Stable) roll generation @%s" % time.ctime())
shutil.copy("%s/_electorate.txt" % tmp_dir, shutil.copy("%s/_electorate.txt" % tmp_dir,
"./%s/stable_branch_maintenance.txt" % args.tag) "./%s/stable_branch_maintenance.txt" % args.tag)

7
openstack_election/owners.py
View File

@ -40,8 +40,7 @@
# $ ./venv/bin/pip install pyyaml requests # $ ./venv/bin/pip install pyyaml requests
# [...] # [...]
# $ ./venv/bin/python tools/owners.py -a 2015-03-04 \ # $ ./venv/bin/python tools/owners.py -a 2015-03-04 \
# -b 2016-03-04 -i 11131 -i 22816 -o owners \ # -b 2016-03-04 -o owners -r march-2016-elections
# -r march-2016-elections
# MISSING: ansible-build-image # MISSING: ansible-build-image
# MERGING DUPLICATE ACCOUNT: 8074 into 2467 # MERGING DUPLICATE ACCOUNT: 8074 into 2467
# [...blah, blah, blah...wait for completion...] # [...blah, blah, blah...wait for completion...]
@ -53,8 +52,8 @@
# the full electorate over like: # the full electorate over like:
# #
# $ ./venv/bin/python tools/owners.py -a 2015-03-04 \ # $ ./venv/bin/python tools/owners.py -a 2015-03-04 \
# -b 2016-03-04 -i 11131 -i 22816 -o sbm \ # -b 2016-03-04 -o sbm -r march-2016-elections \
# -r march-2016-elections -n -s 'branch:^stable/.*' # -n -s 'branch:^stable/.*'
# [...wait for completion again...] # [...wait for completion again...]
# $ cp sbm/_electorate.txt owners/stable_branch_maintenance.txt # $ cp sbm/_electorate.txt owners/stable_branch_maintenance.txt
# $ cp sbm/_all_owners.yaml owners/stable_branch_maintenance.yaml # $ cp sbm/_all_owners.yaml owners/stable_branch_maintenance.yaml