update aclmanager to use default series argument

Instead of requiring the series argument, look at the default that the
rest of the scripts use. There is still a command line option for
overriding the default.

Change-Id: I7168b4786ac8f275da1ff0cd177268b3a4c20c17
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2017-01-09 10:03:36 -05:00
parent afef890fb6
commit b0e5ba6e7e
3 changed files with 9 additions and 9 deletions

View File

@ -81,14 +81,14 @@ Between Milestone-2 and Milestone-3
generated (for all release:cycle-with-milestones deliverables) generated (for all release:cycle-with-milestones deliverables)
with:: with::
tox -e aclmanager -- acls /path/to/openstack-infra/project-config $series tox -e aclmanager -- acls /path/to/openstack-infra/project-config
2. Set the population of all $project-release-branch groups to the 2. Set the population of all $project-release-branch groups to the
"Release Managers" group and $project-release. This can be done "Release Managers" group and $project-release. This can be done
(for all release:cycle-with-milestones deliverables) by running (for all release:cycle-with-milestones deliverables) by running
``aclmanager.py``:: ``aclmanager.py``::
tox -e aclmanager -- groups pre_release $series $user tox -e aclmanager -- groups pre_release $user
($user being your Gerrit username) ($user being your Gerrit username)

View File

@ -483,7 +483,7 @@ To create the ACL patch for stable/newton:
:: ::
tox -e aclmanager -- acls ~/branches/openstack-infra/project-config newton tox -e aclmanager -- --series newton acls ~/branches/openstack-infra/project-config
To set the pre-release group membership: To set the pre-release group membership:

View File

@ -27,6 +27,7 @@ from requests.packages import urllib3
import yaml import yaml
import openstack_releases import openstack_releases
from openstack_releases import defaults
from openstack_releases import deliverable from openstack_releases import deliverable
# Turn of warnings about bad SSL config. # Turn of warnings about bad SSL config.
@ -183,6 +184,11 @@ def main(args=sys.argv[1:]):
default=openstack_releases.deliverable_dir, default=openstack_releases.deliverable_dir,
help='location of deliverable files', help='location of deliverable files',
) )
parser.add_argument(
'--series',
default=defaults.RELEASE,
help='release series to use for repo/team membership',
)
subparsers = parser.add_subparsers(title='commands') subparsers = parser.add_subparsers(title='commands')
do_acls = subparsers.add_parser( do_acls = subparsers.add_parser(
@ -191,9 +197,6 @@ def main(args=sys.argv[1:]):
do_acls.add_argument( do_acls.add_argument(
'repository', 'repository',
help='location of the local project-config repository') help='location of the local project-config repository')
do_acls.add_argument(
'series',
help='series to generate ACL for')
do_acls.set_defaults(func=patch_acls) do_acls.set_defaults(func=patch_acls)
do_groups = subparsers.add_parser( do_groups = subparsers.add_parser(
@ -203,9 +206,6 @@ def main(args=sys.argv[1:]):
'stage', 'stage',
choices=['pre_release', 'post_release'], choices=['pre_release', 'post_release'],
help='type of modification to push') help='type of modification to push')
do_groups.add_argument(
'series',
help='series to modify groups for')
do_groups.add_argument( do_groups.add_argument(
'username', 'username',
help='gerrit HTTP username') help='gerrit HTTP username')