From 97cacc26cc1f380456c6705c08d41c88502d3ddd Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 7 Dec 2020 15:41:06 +0000 Subject: [PATCH] Enable tripleo core members to change WIP flag This change enables people that already had permission to abandon other changes to also toggle the WIP flag on them. Change-Id: I894df2e26c6927eac25dbfe596a93f4209ff92ee Reference: https://gerrit-review.googlesource.com/c/gerrit/+/212571/3/java/com/google/gerrit/common/data/Permission.java#49 --- gerrit/acls/openstack/tripleo-ansible.config | 1 + gerrit/acls/openstack/tripleo-ci-shared-core.config | 1 + gerrit/acls/openstack/tripleo-ci.config | 1 + gerrit/acls/openstack/tripleo-ha-utils.config | 1 + gerrit/acls/openstack/tripleo-quickstart.config | 1 + gerrit/acls/openstack/tripleo-specs.config | 1 + gerrit/acls/openstack/tripleo-upgrade.config | 1 + tools/check_projects_yaml_alphabetized.sh | 3 ++- tools/check_valid_gerrit_config.sh | 3 ++- tools/normalize_acl.py | 1 + 10 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gerrit/acls/openstack/tripleo-ansible.config b/gerrit/acls/openstack/tripleo-ansible.config index bb4c5ca7e8..9113a43243 100644 --- a/gerrit/acls/openstack/tripleo-ansible.config +++ b/gerrit/acls/openstack/tripleo-ansible.config @@ -3,6 +3,7 @@ abandon = group tripleo-ansible-core label-Code-Review = -2..+2 group tripleo-ansible-core label-Verified = -1..+1 group tripleo-ci label-Workflow = -1..+1 group tripleo-ansible-core +toggleWipState = group tripleo-ansible-core [receive] requireChangeId = true diff --git a/gerrit/acls/openstack/tripleo-ci-shared-core.config b/gerrit/acls/openstack/tripleo-ci-shared-core.config index 0bab55139f..9da560440f 100644 --- a/gerrit/acls/openstack/tripleo-ci-shared-core.config +++ b/gerrit/acls/openstack/tripleo-ci-shared-core.config @@ -3,6 +3,7 @@ abandon = group tripleo-ci-shared-core label-Code-Review = -2..+2 group tripleo-ci-shared-core label-Verified = -1..+1 group tripleo-ci label-Workflow = -1..+1 group tripleo-ci-shared-core +toggleWipState = group tripleo-ci-shared-core [receive] requireChangeId = true diff --git a/gerrit/acls/openstack/tripleo-ci.config b/gerrit/acls/openstack/tripleo-ci.config index ffbb3776ef..01d5358dfc 100644 --- a/gerrit/acls/openstack/tripleo-ci.config +++ b/gerrit/acls/openstack/tripleo-ci.config @@ -4,6 +4,7 @@ label-Code-Review = -2..+2 group tripleo-ci-core label-Review-Priority = -1..+2 group tripleo-ci-core label-Verified = -1..+1 group tripleo-ci label-Workflow = -1..+1 group tripleo-ci-core +toggleWipState = group tripleo-ci-core [label "Review-Priority"] copyAllScoresIfNoCodeChange = true diff --git a/gerrit/acls/openstack/tripleo-ha-utils.config b/gerrit/acls/openstack/tripleo-ha-utils.config index 33c46eb8d3..8b86863096 100644 --- a/gerrit/acls/openstack/tripleo-ha-utils.config +++ b/gerrit/acls/openstack/tripleo-ha-utils.config @@ -3,6 +3,7 @@ abandon = group tripleo-ha-utils-core label-Code-Review = -2..+2 group tripleo-ha-utils-core label-Verified = -1..+1 group tripleo-ci label-Workflow = -1..+1 group tripleo-ha-utils-core +toggleWipState = group tripleo-ha-utils-core [receive] requireChangeId = true diff --git a/gerrit/acls/openstack/tripleo-quickstart.config b/gerrit/acls/openstack/tripleo-quickstart.config index 860d3fb378..805a48475c 100644 --- a/gerrit/acls/openstack/tripleo-quickstart.config +++ b/gerrit/acls/openstack/tripleo-quickstart.config @@ -3,6 +3,7 @@ abandon = group tripleo-quickstart-core label-Code-Review = -2..+2 group tripleo-quickstart-core label-Verified = -1..+1 group tripleo-ci label-Workflow = -1..+1 group tripleo-quickstart-core +toggleWipState = group tripleo-quickstart-core [receive] requireChangeId = true diff --git a/gerrit/acls/openstack/tripleo-specs.config b/gerrit/acls/openstack/tripleo-specs.config index 2c6ac17b92..444750edb4 100644 --- a/gerrit/acls/openstack/tripleo-specs.config +++ b/gerrit/acls/openstack/tripleo-specs.config @@ -2,6 +2,7 @@ abandon = group tripleo-core label-Code-Review = -2..+2 group tripleo-core label-Workflow = -1..+1 group tripleo-core +toggleWipState = group tripleo-core [receive] requireChangeId = true diff --git a/gerrit/acls/openstack/tripleo-upgrade.config b/gerrit/acls/openstack/tripleo-upgrade.config index 1f560e57e6..60440c2508 100644 --- a/gerrit/acls/openstack/tripleo-upgrade.config +++ b/gerrit/acls/openstack/tripleo-upgrade.config @@ -3,6 +3,7 @@ abandon = group tripleo-upgrade-core label-Code-Review = -2..+2 group tripleo-upgrade-core label-Verified = -1..+1 group tripleo-ci label-Workflow = -1..+1 group tripleo-upgrade-core +toggleWipState = group tripleo-upgrade-core [receive] requireChangeId = true diff --git a/tools/check_projects_yaml_alphabetized.sh b/tools/check_projects_yaml_alphabetized.sh index 040a8342cd..e981d01e17 100755 --- a/tools/check_projects_yaml_alphabetized.sh +++ b/tools/check_projects_yaml_alphabetized.sh @@ -3,7 +3,8 @@ # It checks that projects.yaml alphabetized and prints list of projects that # should be sorted. -export TMPDIR=`/bin/mktemp -d` +TMPDIR=$(mktemp -d) +export TMPDIR trap "rm -rf $TMPDIR" EXIT pushd $TMPDIR diff --git a/tools/check_valid_gerrit_config.sh b/tools/check_valid_gerrit_config.sh index ac12074e41..31f1583112 100755 --- a/tools/check_valid_gerrit_config.sh +++ b/tools/check_valid_gerrit_config.sh @@ -2,7 +2,8 @@ # It checks that *.config files respect certain gerrit ACL rules -export TMPDIR=$(/bin/mktemp -d) +TMPDIR=$(mktemp -d) +export TMPDIR trap "rm -rf $TMPDIR" EXIT pushd $TMPDIR diff --git a/tools/normalize_acl.py b/tools/normalize_acl.py index d40031d819..1c7daa638b 100755 --- a/tools/normalize_acl.py +++ b/tools/normalize_acl.py @@ -83,6 +83,7 @@ valid_keys = {'abandon', 'requireContributorAgreement', 'state', 'submit', + 'toggleWipState', 'value'} if '0' in transformations or not transformations: