project.config: use CRIA for approvers and trybots groups

To prevent skew between LUCI and Gerrit permissions, use CRIA groups for
everything.

I've flip-flopped on my previous position that groups shouldn't be
nested. So in CRIA, mdb/golang-team is a member of approvers, and
approvers is a member of trybots. As such we never need both approvers
and trybots in an ACL.

I left gobot out of the approvers group, which is a change from
today. I tried to use good judgment about which permissions to grant it,
so it has lost a couple that I don't think it needs.

In a week or so I'll clear out and hide the groups.

Change-Id: Iae1e3e09c9c9efb697eb21060e0f645b39a2cb36
Reviewed-on: https://go-review.googlesource.com/c/All-Projects/+/493621
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>

groups

diff --git a/groups b/groups
index cc07df6..7e1d51c 100644
--- a/groups
+++ b/groups
@@ -5,6 +5,7 @@
 a68e77fe594e959daaacc2fb670298964f78acfa                      	approvers
 adf76ba6894d57eca12698844876eafed66f9990                      	gerritbot
 c7bf27e6d6fe0835046491033e39afd234b33db5                      	may-abandon-changes
+cria:project-golang-approvers                                 	cria/project-golang-approvers
 cria:project-golang-may-start-trybots                         	cria/project-golang-may-start-trybots
 df7e96111acb673748b3161cac96c45ca77a5994                      	may-upload-all-cls
 ebedd7e04a70b1e91cab6bbec6a73155b5c44d5c                      	luci_scoped_account

project.config

diff --git a/project.config b/project.config
index 1dbca7c..4602c1c 100644
--- a/project.config
+++ b/project.config
@@ -21,36 +21,34 @@
 	push = group Registered Users
 	pushMerge = group Registered Users
 [access "refs/heads/*"]
-	forgeAuthor = group approvers
+	forgeAuthor = group cria/project-golang-approvers
 	forgeAuthor = group gerritbot
+	forgeAuthor = group gobot
 	forgeAuthor = group may-upload-all-cls
 	forgeCommitter = group gerritbot
-	submit = group approvers
+	submit = group cria/project-golang-approvers
 	submit = group gobot
-	editTopicName = group approvers
-	editHashtags = group approvers
+	editTopicName = group cria/project-golang-approvers
+	editHashtags = group cria/project-golang-approvers
 	editHashtags = group gobot
-	removeReviewer = group approvers
+	removeReviewer = group cria/project-golang-approvers
+	removeReviewer = group gobot
 	abandon = group may-abandon-changes
 	create = group mdb/golang-gob-branchers
-	label-Auto-Submit = +0..+1 group approvers
-	removeLabel-Auto-Submit = +0..+1 group approvers
-	label-Code-Review = +0..+2 group approvers
+	label-Auto-Submit = +0..+1 group cria/project-golang-approvers
+	label-Auto-Submit = +0..+1 group gobot
+	removeLabel-Auto-Submit = +0..+1 group cria/project-golang-approvers
+	label-Code-Review = +0..+2 group cria/project-golang-approvers
 	label-Code-Review = +0..+1 group Registered Users
-	removeLabel-Code-Review = +0..+2 group approvers
-	label-Hold = +0..+1 group approvers
-	removeLabel-Hold = +0..+1 group approvers
-	label-Run-TryBot = +0..+1 group approvers
+	removeLabel-Code-Review = +0..+2 group cria/project-golang-approvers
+	label-Hold = +0..+1 group cria/project-golang-approvers
+	removeLabel-Hold = +0..+1 group cria/project-golang-approvers
 	label-Run-TryBot = +0..+1 group cria/project-golang-may-start-trybots
-	label-Run-TryBot = +0..+1 group may-start-trybots
-	removeLabel-Run-TryBot = +0..+1 group approvers
+	label-Run-TryBot = +0..+1 group gobot
 	removeLabel-Run-TryBot = +0..+1 group cria/project-golang-may-start-trybots
-	removeLabel-Run-TryBot = +0..+1 group may-start-trybots
 	label-TryBot-Result = -1..+1 group gobot
-	removeLabel-TryBot-Result = -1..+1 group approvers
 	removeLabel-TryBot-Result = -1..+1 group cria/project-golang-may-start-trybots
-	removeLabel-TryBot-Result = -1..+1 group may-start-trybots
-	label-TryBot-Bypass = +0..+1 group approvers
+	label-TryBot-Bypass = +0..+1 group cria/project-golang-approvers
 [access "refs/for/refs/meta/config"]
 	push = group mdb/gerritcodereview-eng
 	push = group mdb/golang-gob-eng-policy
@@ -80,7 +78,6 @@
 	submit = group luci_scoped_account
 	label-Commit-Queue = +0..+2 group mdb/golang-release-eng-policy
 	label-Commit-Queue = +0..+1 group cria/project-golang-may-start-trybots
-	label-Commit-Queue = +0..+1 group mdb/golang-team
 	labelAs-Commit-Queue = +0..+2 group luci_scoped_account
 [label "Code-Review"]
 	function = NoBlock