From 1c0400db533960ad252dedba4c2676745192a262 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 2 Mar 2023 10:33:11 +1100
Subject: [PATCH] gerrit/acl : Convert remaining AnyWithBlock to submit
 requirements

Prior change Id5157b9f59082485b6aff92c4f3527fb4c8084aa updated the
Review-Priority label; this converts the couple of remaining
AnyWithBlock labels that didn't match the review-priority pattern to
submit requirements.

Change-Id: Id57bdb4f6ed38a90a37a738068446197e6a24769
---
 gerrit/acls/opendev/infra-specs.config | 6 +++++-
 gerrit/acls/openstack/releases.config  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gerrit/acls/opendev/infra-specs.config b/gerrit/acls/opendev/infra-specs.config
index 3101c37476..11d1084ac4 100644
--- a/gerrit/acls/opendev/infra-specs.config
+++ b/gerrit/acls/opendev/infra-specs.config
@@ -17,7 +17,7 @@ value = +2 Unused +2
 [label "Rollcall-Vote"]
 copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
-function = AnyWithBlock
+function = NoOp
 value = -2 Veto
 value = -1 No
 value = 0 Abstain
@@ -34,3 +34,7 @@ mergeContent = true
 applicableIf = is:false
 description = Informational vote on current revision
 submittableIf = is:true
+
+[submit-requirement "Rollcall-Vote"]
+description = Votes from core team members
+submittableIf = -label:Rollcall-Vote=MIN
diff --git a/gerrit/acls/openstack/releases.config b/gerrit/acls/openstack/releases.config
index 5126f46b5a..9d4bc83ab9 100644
--- a/gerrit/acls/openstack/releases.config
+++ b/gerrit/acls/openstack/releases.config
@@ -10,7 +10,7 @@ label-Workflow = -1..+1 group releases-core
 [label "PTL-Approved"]
 copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
-function = AnyWithBlock
+function = NoOp
 value = -1 Block
 value = 0 Abstain
 value = +1 Approved by PTL
@@ -21,3 +21,7 @@ requireContributorAgreement = true
 
 [submit]
 mergeContent = true
+
+[submit-requirement "PTL-Approved"]
+description = PTL Approval
+submittableIf = -label:PTL-Approved=MIN