From a01a33a17432bb204a9c2fc9e6847c21a06e00a9 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 7 Feb 2014 22:00:28 +0000
Subject: [PATCH] No longer grant third-party voting initially
* doc/source/gerrit.rst: Update documentation to reflect that the
External Testing Tools group has been replaced by two new groups
named Third-Party CI and Voting Third-Party CI. New third-party
continuous integration testing service accounts are initially added
to the first group, which allows them to apply verify votes only on
the openstack-dev/sandbox project. Once they have managed to confirm
some stability, they are moved to the second group, which is also
included by the first, so that they may apply verify votes on any
project.
* .../gerrit/acls/openstack-dev/sandbox.config: Apply verify voting
permissions for Third-Party CI group members, and correct review
activity permissions to use the Registered Users group instead of
the long-defunct openstack-cla group.
Change-Id: Ief3fef44df986d868af148787b3c456a98484091
---
doc/source/gerrit.rst | 13 ++++++++-----
.../gerrit/acls/openstack-dev/sandbox.config | 15 ++++++++-------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst
index 2bc92dcf05..f2c89cf792 100644
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@@ -116,8 +116,11 @@ is the only member of this group, but members of the `Administrators`
group may temporarily add themselves in order to correct problems with
automatic project creation.
-The `External Testing Tools` group is used to grant +/-1 Verified
-access to external testing tools.
+The `Third-Party CI` group is used to grant +/-1 Verified
+access to external testing tools on a sandbox project.
+
+The `Voting Third-Party CI` group is used to grant +/-1 Verified
+access to external testing tools for all projects.
The `Continuous Integration Tools` group contains Jenkins and any
other CI tools that get +2/-2 access on reviews.
@@ -304,7 +307,7 @@ Next, edit `project.config` to look like::
label-Code-Review = -1..+1 group Registered Users
label-Verified = -2..+2 group Continuous Integration Tools
label-Verified = -2..+2 group Project Bootstrappers
- label-Verified = -1..+1 group External Testing Tools
+ label-Verified = -1..+1 group Voting Third-Party CI
submit = group Continuous Integration Tools
submit = group Project Bootstrappers
label-Approved = +0..+1 group Project Bootstrappers
@@ -468,7 +471,7 @@ Testing`_) looks like:
.. code-block:: shell
ssh -p 29418 review.openstack.org "gerrit create-account \
- --group 'External Testing Tools' \
+ --group 'Third-Party CI' \
--full-name 'Some CI Bot' \
--email ci-bot@third-party.org \
--ssh-key 'ssh-rsa AAAAB3Nz...zaUCse1P ci-bot@third-party.org' \
@@ -477,7 +480,7 @@ Testing`_) looks like:
Details on the create-account_ command can be found in the Gerrit
API documentation.
-.. _`External Testing Tools`: http://ci.openstack.org/third_party.html
+.. _`Third-Party CI`: http://ci.openstack.org/third_party.html
.. _create-account: https://review.openstack.org/Documentation/cmd-create-account.html
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
index 751d79ce15..868f101656 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
@@ -1,12 +1,13 @@
[access "refs/heads/*"]
- label-Code-Review = -2..+2 group openstack-cla
- label-Approved = +0..+1 group openstack-cla
- workInProgress = group openstack-cla
+ label-Verified = -1..+1 group Third-Party CI
+ label-Code-Review = -2..+2 group Registered Users
+ label-Approved = +0..+1 group Registered Users
+ workInProgress = group Registered Users
[access "refs/heads/milestone-proposed"]
- label-Code-Review = -2..+2 group openstack-cla
- label-Approved = +0..+1 group openstack-cla
-[project]
- state = active
+ label-Verified = -1..+1 group Third-Party CI
+ label-Code-Review = -2..+2 group Registered Users
+ label-Approved = +0..+1 group Registered Users
+ workInProgress = group Registered Users
[receive]
requireChangeId = true
requireContributorAgreement = true