From c49fb365ff65178e928cdd021521239235516044 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 7 May 2019 10:54:06 -0700 Subject: [PATCH] Create 'Backport-Candidate' for Octavia repos The Octavia team would like to enabled passive voting on patches for backport candidates. This means that backport candidate votes will not block a patch from merging, but will allow the team to better track patches that should be backported. Change-Id: Ib75714649848538e9fed171abd0b11f6fbc55503 --- gerrit/acls/openstack/octavia-dashboard.config | 12 ++++++++++++ gerrit/acls/openstack/octavia-lib.config | 12 ++++++++++++ gerrit/acls/openstack/octavia.config | 12 ++++++++++++ gerrit/acls/openstack/python-octaviaclient.config | 12 ++++++++++++ tools/normalize_acl.py | 1 + 5 files changed, 49 insertions(+) diff --git a/gerrit/acls/openstack/octavia-dashboard.config b/gerrit/acls/openstack/octavia-dashboard.config index aa218efbc0..6cfe2e02e9 100644 --- a/gerrit/acls/openstack/octavia-dashboard.config +++ b/gerrit/acls/openstack/octavia-dashboard.config @@ -1,5 +1,6 @@ [access "refs/heads/*"] abandon = group octavia-dashboard-core +label-Backport-Candidate = -2..+2 group octavia-dashboard-core label-Code-Review = -2..+2 group octavia-dashboard-core label-Verified = -1..+1 group octavia-ci label-Workflow = -1..+1 group octavia-dashboard-core @@ -19,6 +20,17 @@ label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group octavia-stable-maint label-Workflow = -1..+1 group stable-maint-core +[label "Backport-Candidate"] +copyAllScoresIfNoCodeChange = true +copyAllScoresOnTrivialRebase = true +defaultValue = 0 +function = NoBlock +value = -2 Do Not Backport +value = -1 Not A Backport Candidate +value = 0 Backport Review Needed +value = +1 Proposed Backport +value = +2 Should Backport + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/gerrit/acls/openstack/octavia-lib.config b/gerrit/acls/openstack/octavia-lib.config index 1ce57f0c83..138c5a280a 100644 --- a/gerrit/acls/openstack/octavia-lib.config +++ b/gerrit/acls/openstack/octavia-lib.config @@ -1,5 +1,6 @@ [access "refs/heads/*"] abandon = group octavia-lib-core +label-Backport-Candidate = -2..+2 group octavia-lib-core label-Code-Review = -2..+2 group octavia-lib-core label-Verified = -1..+1 group octavia-ci label-Workflow = -1..+1 group octavia-lib-core @@ -19,6 +20,17 @@ label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group octavia-stable-maint label-Workflow = -1..+1 group stable-maint-core +[label "Backport-Candidate"] +copyAllScoresIfNoCodeChange = true +copyAllScoresOnTrivialRebase = true +defaultValue = 0 +function = NoBlock +value = -2 Do Not Backport +value = -1 Not A Backport Candidate +value = 0 Backport Review Needed +value = +1 Proposed Backport +value = +2 Should Backport + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/gerrit/acls/openstack/octavia.config b/gerrit/acls/openstack/octavia.config index 2dc8952a2b..72d128df96 100644 --- a/gerrit/acls/openstack/octavia.config +++ b/gerrit/acls/openstack/octavia.config @@ -3,6 +3,7 @@ pushMerge = group octavia-release [access "refs/heads/*"] abandon = group octavia-core +label-Backport-Candidate = -2..+2 group octavia-core label-Code-Review = -2..+2 group octavia-core label-Verified = -1..+1 group octavia-ci label-Workflow = -1..+1 group octavia-core @@ -22,6 +23,17 @@ label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group octavia-stable-maint label-Workflow = -1..+1 group stable-maint-core +[label "Backport-Candidate"] +copyAllScoresIfNoCodeChange = true +copyAllScoresOnTrivialRebase = true +defaultValue = 0 +function = NoBlock +value = -2 Do Not Backport +value = -1 Not A Backport Candidate +value = 0 Backport Review Needed +value = +1 Proposed Backport +value = +2 Should Backport + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/gerrit/acls/openstack/python-octaviaclient.config b/gerrit/acls/openstack/python-octaviaclient.config index 10d41ca387..d7e3d89e03 100644 --- a/gerrit/acls/openstack/python-octaviaclient.config +++ b/gerrit/acls/openstack/python-octaviaclient.config @@ -1,5 +1,6 @@ [access "refs/heads/*"] abandon = group octavia-client-core +label-Backport-Candidate = -2..+2 group octavia-client-core label-Code-Review = -2..+2 group octavia-client-core label-Verified = -1..+1 group octavia-ci label-Workflow = -1..+1 group octavia-client-core @@ -19,6 +20,17 @@ label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group octavia-stable-maint label-Workflow = -1..+1 group stable-maint-core +[label "Backport-Candidate"] +copyAllScoresIfNoCodeChange = true +copyAllScoresOnTrivialRebase = true +defaultValue = 0 +function = NoBlock +value = -2 Do Not Backport +value = -1 Not A Backport Candidate +value = 0 Backport Review Needed +value = +1 Proposed Backport +value = +2 Should Backport + [receive] requireChangeId = true requireContributorAgreement = true diff --git a/tools/normalize_acl.py b/tools/normalize_acl.py index 05dd03937b..8880b2722f 100755 --- a/tools/normalize_acl.py +++ b/tools/normalize_acl.py @@ -68,6 +68,7 @@ valid_keys = {'abandon', 'forgeAuthor', 'forgeCommitter', 'function', + 'label-Backport-Candidate', 'label-Code-Review', 'label-Review-Priority', 'label-Rollcall-Vote',