openstack
/
election
Code Issues Proposed changes

Merge "Stop excluding bot accounts"

This commit is contained in:
Zuul 2018-02-07 11:23:10 +00:00 committed by Gerrit Code Review
parent 16b1e8f0d6 393caa5596
commit a516dc0938
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 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)

7
openstack_election/owners.py
View File

@ -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