From dda3b6098ead3028379afb1ab1b0de9155726b70 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 1 Mar 2023 16:11:24 +1100 Subject: [PATCH] gerrit/acl : submit-requirements for deprecated NoOp function The submit functions are deprecated in Gerrit 3.7 and replaced with submit-requirements. This starts at the replacement with ACL's currently using the NoOp function. This implements the migrations steps encded with [1] upstream. The function is changed to NoBlock, and a "non-applicable" submit-requirement of "applicableIf = is:false" and "submittableIf = is:true" is added, with the same name as the label. Since we are matching the upstream rules for idempotence -- a submit-requirement with the same name as the label, we will avoid future upgrades modifying our ACL's and getting them out of sync with what we have in project-config. From a user's point-of-view, this change itself should be a no-op. [1] https://gerrit-review.googlesource.com/c/gerrit/+/339542 Change-Id: Ic43f561174ebf30474b1b54be2bed02695cebedc --- gerrit/acls/opendev/infra-specs.config | 7 ++++++- gerrit/acls/openinfra/transparency-policy.config | 14 ++++++++++++-- gerrit/acls/openstack/governance.config | 14 ++++++++++++-- gerrit/acls/openstack/nova-specs.config | 7 ++++++- gerrit/acls/openstack/nova.config | 7 ++++++- gerrit/acls/openstack/openstacksdk.config | 7 ++++++- gerrit/acls/openstack/os-vif.config | 7 ++++++- gerrit/acls/openstack/placement.config | 7 ++++++- gerrit/acls/openstack/python-novaclient.config | 7 ++++++- gerrit/acls/openstack/release-test.config | 7 ++++++- gerrit/acls/starlingx/governance.config | 14 ++++++++++++-- 11 files changed, 84 insertions(+), 14 deletions(-) diff --git a/gerrit/acls/opendev/infra-specs.config b/gerrit/acls/opendev/infra-specs.config index 5a45730c1d..3101c37476 100644 --- a/gerrit/acls/opendev/infra-specs.config +++ b/gerrit/acls/opendev/infra-specs.config @@ -7,7 +7,7 @@ label-Workflow = -1..+1 group infra-ptl [label "Code-Review"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -2 Unused -2 value = -1 This patch needs further work before it can be merged value = 0 No score @@ -29,3 +29,8 @@ requireChangeId = true [submit] mergeContent = true + +[submit-requirement "Code-Review"] +applicableIf = is:false +description = Informational vote on current revision +submittableIf = is:true diff --git a/gerrit/acls/openinfra/transparency-policy.config b/gerrit/acls/openinfra/transparency-policy.config index b985ef7256..abfa7f0aa6 100644 --- a/gerrit/acls/openinfra/transparency-policy.config +++ b/gerrit/acls/openinfra/transparency-policy.config @@ -14,7 +14,7 @@ createSignedTag = group transparency-committee-chair [label "Code-Review"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -2 Unused -2 value = -1 This patch needs further work before it can be merged value = 0 No score @@ -24,7 +24,7 @@ value = +2 Unused +2 [label "Rollcall-Vote"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -1 No value = 0 Abstain value = +1 Yes @@ -35,3 +35,13 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Code-Review"] +applicableIf = is:false +description = Informational vote on current revision +submittableIf = is:true + +[submit-requirement "Rollcall-Vote"] +applicableIf = is:false +description = An informational vote from team members +submittableIf = is:true diff --git a/gerrit/acls/openstack/governance.config b/gerrit/acls/openstack/governance.config index 8c51558586..03f539fda7 100644 --- a/gerrit/acls/openstack/governance.config +++ b/gerrit/acls/openstack/governance.config @@ -18,7 +18,7 @@ createSignedTag = group tech-committee-chair [label "Code-Review"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -2 Unused -2 value = -1 This patch needs further work before it can be merged value = 0 No score @@ -28,7 +28,7 @@ value = +2 Unused +2 [label "Rollcall-Vote"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -1 No value = 0 Abstain value = +1 Yes @@ -39,3 +39,13 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Code-Review"] +applicableIf = is:false +description = An informational vote on this revision +submittableIf = is:true + +[submit-requirement "Rollcall-Vote"] +applicableIf = is:false +description = An informational vote from team members +submittableIf = is:true diff --git a/gerrit/acls/openstack/nova-specs.config b/gerrit/acls/openstack/nova-specs.config index 06e1396d87..03cc3586eb 100644 --- a/gerrit/acls/openstack/nova-specs.config +++ b/gerrit/acls/openstack/nova-specs.config @@ -11,7 +11,7 @@ label-Workflow = -1..+1 group nova-specs-core [label "Review-Priority"] copyCondition = is:ANY defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Default Priority value = +1 Contributor Review Promise value = +2 Core Review Promise @@ -22,3 +22,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Review-Priority"] +applicableIf = is:false +description = Review Priority +submittableIf = is:true diff --git a/gerrit/acls/openstack/nova.config b/gerrit/acls/openstack/nova.config index c566c1004c..3f09f4475a 100644 --- a/gerrit/acls/openstack/nova.config +++ b/gerrit/acls/openstack/nova.config @@ -30,7 +30,7 @@ label-Workflow = -1..+1 group stable-maint-core [label "Review-Priority"] copyCondition = is:ANY defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Default Priority value = +1 Contributor Review Promise value = +2 Core Review Promise @@ -41,3 +41,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Review-Priority"] +applicableIf = is:false +description = Review Priority +submittableIf = is:true diff --git a/gerrit/acls/openstack/openstacksdk.config b/gerrit/acls/openstack/openstacksdk.config index cf424433fc..aeca1cd2e8 100644 --- a/gerrit/acls/openstack/openstacksdk.config +++ b/gerrit/acls/openstack/openstacksdk.config @@ -27,7 +27,7 @@ label-Workflow = -1..+1 group stable-maint-core [label "Allow-Post-Review"] defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Abstain value = +1 Approved for Zuul Post Review Pipeline @@ -37,3 +37,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Allow-Post-Review"] +applicableIf = is:false +description = Allow Post Review +submittableIf = is:true diff --git a/gerrit/acls/openstack/os-vif.config b/gerrit/acls/openstack/os-vif.config index 1ba1a5dc59..507fa20020 100644 --- a/gerrit/acls/openstack/os-vif.config +++ b/gerrit/acls/openstack/os-vif.config @@ -32,7 +32,7 @@ label-Workflow = -1..+1 group stable-maint-core [label "Review-Priority"] copyCondition = is:ANY defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Default Priority value = +1 Contributor Review Promise value = +2 Core Review Promise @@ -43,3 +43,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Review-Priority"] +applicableIf = is:false +description = Review Priority +submittableIf = is:true diff --git a/gerrit/acls/openstack/placement.config b/gerrit/acls/openstack/placement.config index 4f01524d18..651f710719 100644 --- a/gerrit/acls/openstack/placement.config +++ b/gerrit/acls/openstack/placement.config @@ -30,7 +30,7 @@ label-Workflow = -1..+1 group stable-maint-core [label "Review-Priority"] copyCondition = is:ANY defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Default Priority value = +1 Contributor Review Promise value = +2 Core Review Promise @@ -41,3 +41,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Review-Priority"] +applicableIf = is:false +description = Review Priority +submittableIf = is:true diff --git a/gerrit/acls/openstack/python-novaclient.config b/gerrit/acls/openstack/python-novaclient.config index b2e0af3e00..22f4a3e5b7 100644 --- a/gerrit/acls/openstack/python-novaclient.config +++ b/gerrit/acls/openstack/python-novaclient.config @@ -29,7 +29,7 @@ label-Workflow = -1..+1 group stable-maint-core [label "Review-Priority"] copyCondition = is:ANY defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Default Priority value = +1 Contributor Review Promise value = +2 Core Review Promise @@ -40,3 +40,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Review-Priority"] +applicableIf = is:false +description = Review Priority +submittableIf = is:true diff --git a/gerrit/acls/openstack/release-test.config b/gerrit/acls/openstack/release-test.config index 78007341dd..a6e0475c16 100644 --- a/gerrit/acls/openstack/release-test.config +++ b/gerrit/acls/openstack/release-test.config @@ -10,7 +10,7 @@ label-Workflow = -1..+1 group releases-core [label "PTL-Approved"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = 0 Abstain value = +1 Approved by PTL @@ -20,3 +20,8 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "PTL-Approved"] +applicableIf = is:false +description = Marked as approved by the PTL +submittableIf = is:true diff --git a/gerrit/acls/starlingx/governance.config b/gerrit/acls/starlingx/governance.config index 64c5401f3f..ac311b3079 100644 --- a/gerrit/acls/starlingx/governance.config +++ b/gerrit/acls/starlingx/governance.config @@ -14,7 +14,7 @@ createSignedTag = group stx-tech-steering-committee-secretary [label "Code-Review"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -2 Unused -2 value = -1 This patch needs further work before it can be merged value = 0 No score @@ -24,7 +24,7 @@ value = +2 Unused +2 [label "Rollcall-Vote"] copyCondition = changekind:TRIVIAL_REBASE defaultValue = 0 -function = NoOp +function = NoBlock value = -1 No value = 0 Abstain value = +1 Yes @@ -35,3 +35,13 @@ requireContributorAgreement = true [submit] mergeContent = true + +[submit-requirement "Code-Review"] +applicableIf = is:false +description = Code Review votes are ignored +submittableIf = is:true + +[submit-requirement "Rollcall-Vote"] +applicableIf = is:false +description = An informational vote from team members +submittableIf = is:true