update gerrit project configs to use new Workflow label

after upgrading gerrit to ver 2.8, review.o.o will have a new label
called 'Workflow' that combines approved and wip labels. The
workflow label will replace the workInProgress permission (from WIP
plugin). Updating the project gerrit configs with the new label and
removing workInProgress

Change-Id: I874ad3cf8552a2e5a914cf325bd11afcdf0d59ca

modules/openstack_project/files/gerrit/acls/openstack-dev/cookiecutter.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group cookiecutter-core
+        label-Workflow = -1..+1 group cookiecutter-core
         label-Code-Review = -2..+2 group cookiecutter-core
-        workInProgress = group cookiecutter-core
 [access "refs/tags/*"]
         create = group cookiecutter-core
         pushTag = group cookiecutter-core

modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config

@@ -1,12 +1,11 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group devstack-core
-        label-Approved = +0..+1 group devstack-core
+        label-Workflow = -1..+1 group devstack-core
-        workInProgress = group devstack-core
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group devstack-core
         label-Code-Review = -1..+1 group Registered Users
-        label-Approved = +0..+1 group devstack-core
+        label-Workflow = -1..+1 group devstack-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config

@@ -1,12 +1,11 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group grenade-core
-        label-Approved = +0..+1 group grenade-core
+        label-Workflow = -1..+1 group grenade-core
-        workInProgress = group grenade-core
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group grenade-core
         label-Code-Review = -1..+1 group Registered Users
-        label-Approved = +0..+1 group grenade-core
+        label-Workflow = -1..+1 group grenade-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config

@@ -1,9 +1,8 @@
 [access "refs/*"]
         create = group hacking-ptl
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group hacking-core
+        label-Workflow = -1..+1 group hacking-core
         label-Code-Review = -2..+2 group hacking-core
-        workInProgress = group hacking-core
 [access "refs/tags/*"]
         create = group hacking-ptl
         pushTag = group hacking-ptl

modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group heat-core
-        label-Approved = +0..+1 group heat-core
+        label-Workflow = -1..+1 group heat-core
-        workInProgress = group heat-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group heat-milestone
-        label-Approved = +0..+1 group heat-milestone
+        label-Workflow = -1..+1 group heat-milestone
 [access "refs/tags/*"]
         create = group heat-ptl
         pushTag = group heat-ptl

modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-nose-core
-        label-Approved = +0..+1 group openstack-nose-core
+        label-Workflow = -1..+1 group openstack-nose-core
-        workInProgress = group openstack-nose-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group openstack-nose-milestone
-        label-Approved = +0..+1 group openstack-nose-milestone
+        label-Workflow = -1..+1 group openstack-nose-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-qa.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-qa-core
-        label-Approved = +0..+1 group openstack-qa-core
+        label-Workflow = -1..+1 group openstack-qa-core
-        workInProgress = group openstack-qa-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-dev/oslo-cookiecutter.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group oslo-core
+        label-Workflow = -1..+1 group oslo-core
         label-Code-Review = -2..+2 group oslo-core
-        workInProgress = group oslo-core
 [access "refs/tags/*"]
         create = group oslo-core
         pushTag = group oslo-core

modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group pbr-core
+        label-Workflow = -1..+1 group pbr-core
         label-Code-Review = -2..+2 group pbr-core
-        workInProgress = group pbr-core
 [access "refs/tags/*"]
         create = group pbr-core
         pushTag = group pbr-core

modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config

@@ -1,13 +1,11 @@
 [access "refs/heads/*"]
         label-Verified = -1..+1 group Third-Party CI
         label-Code-Review = -2..+2 group Registered Users
-        label-Approved = +0..+1 group Registered Users
+        label-Workflow = -1..+1 group Registered Users
-        workInProgress = group Registered Users
 [access "refs/heads/milestone-proposed"]
         label-Verified = -1..+1 group Third-Party CI
         label-Code-Review = -2..+2 group Registered Users
-        label-Approved = +0..+1 group Registered Users
+        label-Workflow = -1..+1 group Registered Users
-        workInProgress = group Registered Users
 [receive]
         requireChangeId = true
         requireContributorAgreement = true

modules/openstack_project/files/gerrit/acls/openstack-dev/specs-cookiecutter.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group cookiecutter-core
+        label-Workflow = -1..+1 group cookiecutter-core
         label-Code-Review = -2..+2 group cookiecutter-core
-        workInProgress = group cookiecutter-core
 [access "refs/tags/*"]
         create = group cookiecutter-core
         pushTag = group cookiecutter-core

modules/openstack_project/files/gerrit/acls/openstack-infra/activity-board.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group activity-board-core
-        label-Approved = +0..+1 group activity-board-core
+        label-Workflow = -1..+1 group activity-board-core
-        workInProgress = group activity-board-core
 [access "refs/tags/*"]
         create = group activity-board-core
         pushTag = group activity-board-core

modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group askbot-theme-core
-        label-Approved = +0..+1 group askbot-theme-core
+        label-Workflow = -1..+1 group askbot-theme-core
-        workInProgress = group askbot-theme-core
 [access "refs/tags/*"]
         create = group askbot-theme-core
         pushTag = group askbot-theme-core

modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/config.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/devstack-gate.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group devstack-gate-core
-        label-Approved = +0..+1 group devstack-gate-core
+        label-Workflow = -1..+1 group devstack-gate-core
-        workInProgress = group devstack-gate-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/elastic-recheck.config

@@ -1,9 +1,8 @@
 [access "refs/*"]
         create = group elastic-recheck-ptl
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group elastic-recheck-core
+        label-Workflow = -1..+1 group elastic-recheck-core
         label-Code-Review = -2..+2 group elastic-recheck-core
-        workInProgress = group elastic-recheck-core
 [access "refs/tags/*"]
         create = group elastic-recheck-ptl
         pushTag = group elastic-recheck-ptl

modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/gearman-plugin.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group gearman-plugin-core
-        label-Approved = +0..+1 group gearman-plugin-core
+        label-Workflow = -1..+1 group gearman-plugin-core
-        workInProgress = group gearman-plugin-core
 [access "refs/tags/*"]
         create = group gearman-plugin-core
         pushTag = group gearman-plugin-core

modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-powered-agenda.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group gerrit-powered-agenda-core
-        label-Approved = +0..+1 group gerrit-powered-agenda-core
+        label-Workflow = -1..+1 group gerrit-powered-agenda-core
-        workInProgress = group gerrit-powered-agenda-core
 [access "refs/tags/*"]
         create = group gerrit-powered-agenda-ptl
         pushTag = group gerrit-powered-agenda-ptl

modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
         label-Code-Review = -2..+2 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config

@@ -5,9 +5,8 @@
         pushMerge = group openstack-ci-core
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         forgeAuthor = group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [access "refs/heads/upstream/*"]
         push = group openstack-ci-core
         forgeAuthor = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config

@@ -2,9 +2,8 @@
         create = group openstack-ci-core
         pushTag = group openstack-ci-core
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config

@@ -3,8 +3,7 @@
         create = group openstack-ci-admins
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group stats-core
+        label-Workflow = -1..+1 group stats-core
         label-Code-Review = -2..+2 group stats-core
-        workInProgress = group stats-core
 [access "refs/tags/*"]
         create = group stats-core
         pushTag = group stats-core

modules/openstack_project/files/gerrit/acls/openstack-infra/groups.config

@@ -2,9 +2,8 @@
         create = group groups-core
         pushTag = group groups-core
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group groups-core
+        label-Workflow = -1..+1 group groups-core
         label-Code-Review = -2..+2 group groups-core
-        workInProgress = group groups-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group jenkins-job-builder-core
+        label-Workflow = -1..+1 group jenkins-job-builder-core
         label-Code-Review = -2..+2 group jenkins-job-builder-core
-        workInProgress = group jenkins-job-builder-core
 [access "refs/tags/*"]
         create = group jenkins-job-builder-ptl
         pushTag = group jenkins-job-builder-ptl

modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config

@@ -3,9 +3,8 @@
         pushTag = group openstack-ci-core
 [access "refs/heads/*"]
         forgeAuthor = group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config

@@ -2,8 +2,7 @@
         pushMerge = group openstack-ci-core
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config

@@ -3,9 +3,8 @@
         pushTag = group openstack-ci-core
 [access "refs/heads/*"]
         forgeAuthor = group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group odsreg-core
-        label-Approved = +0..+1 group odsreg-core
+        label-Workflow = -1..+1 group odsreg-core
-        workInProgress = group odsreg-core
 [access "refs/tags/*"]
         create = group odsreg-core
         pushTag = group odsreg-core

modules/openstack_project/files/gerrit/acls/openstack-infra/openstackid.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstackid-core
-        label-Approved = +0..+1 group openstackid-core
+        label-Workflow = -1..+1 group openstackid-core
-        workInProgress = group openstackid-core
 [access "refs/tags/*"]
         create = group openstackid-ptl
         pushTag = group openstackid-ptl

modules/openstack_project/files/gerrit/acls/openstack-infra/os-loganalyze.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group os-loganalyze-core
-        label-Approved = +0..+1 group os-loganalyze-core
+        label-Workflow = -1..+1 group os-loganalyze-core
-        workInProgress = group os-loganalyze-core
 [access "refs/tags/*"]
         create = group os-loganalyze-core
         pushTag = group os-loganalyze-core

modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [access "refs/tags/*"]
         create = group openstack-ci-admins
         pushTag = group openstack-ci-admins

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config

@@ -1,9 +1,8 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [access "refs/meta/config"]
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
         label-Code-Review = -2..+2 group openstack-ci-admins
         label-Verified = -2..+2 group openstack-ci-admins
         submit = group openstack-ci-admins

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config

@@ -1,9 +1,8 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [access "refs/meta/config"]
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
         label-Code-Review = -2..+2 group openstack-ci-admins
         label-Verified = -2..+2 group openstack-ci-admins
         submit = group openstack-ci-admins

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config

@@ -1,9 +1,8 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-admins
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
-        workInProgress = group openstack-ci-admins
 [access "refs/meta/config"]
-        label-Approved = +0..+1 group openstack-ci-admins
+        label-Workflow = -1..+1 group openstack-ci-admins
         label-Code-Review = -2..+2 group openstack-ci-admins
         label-Verified = -2..+2 group openstack-ci-admins
         submit = group openstack-ci-admins

modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/release-tools.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group release-tools-core
-        label-Approved = +0..+1 group release-tools-core
+        label-Workflow = -1..+1 group release-tools-core
-        workInProgress = group release-tools-core
 [access "refs/tags/*"]
         create = group release-tools-core
         pushTag = group release-tools-core

modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group releasestatus-core
-        label-Approved = +0..+1 group releasestatus-core
+        label-Workflow = -1..+1 group releasestatus-core
-        workInProgress = group releasestatus-core
 [access "refs/tags/*"]
         create = group releasestatus-core
         pushTag = group releasestatus-core

modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-reviewday
-        label-Approved = +0..+1 group openstack-reviewday
+        label-Workflow = -1..+1 group openstack-reviewday
-        workInProgress = group openstack-reviewday
 [access "refs/tags/*"]
         create = group openstack-reviewday
         pushTag = group openstack-reviewday

modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group stats-core
+        label-Workflow = -1..+1 group stats-core
         label-Code-Review = -2..+2 group stats-core
-        workInProgress = group stats-core
 [access "refs/tags/*"]
         create = group stats-core
         pushTag = group stats-core

modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config

@@ -2,9 +2,8 @@
         create = group openstack-ci-core
         pushTag = group openstack-ci-core
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
         label-Code-Review = -2..+2 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/storyboard.config

@@ -2,9 +2,8 @@
         create = group storyboard-core
         pushTag = group storyboard-core
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group storyboard-core
+        label-Workflow = -1..+1 group storyboard-core
         label-Code-Review = -2..+2 group storyboard-core
-        workInProgress = group storyboard-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config

@@ -5,8 +5,7 @@
    mergeContent = true
 [access "refs/heads/*"]
    label-Code-Review = -2..+2 group toci-core
-   label-Approved = +0..+1 group toci-core
+   label-Workflow = -1..+1 group toci-core
-   workInProgress = group toci-core
 [access "refs/heads/milestone-proposed"]
    label-Code-Review = -2..+2 group toci-core
-   label-Approved = +0..+1 group toci-core
+   label-Workflow = -1..+1 group toci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack-infra/zuul-packaging.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-infra-packagers
-        label-Approved = +0..+1 group openstack-infra-packagers
+        label-Workflow = -1..+1 group openstack-infra-packagers
-        workInProgress = group openstack-infra-packagers
 [access "refs/tags/*"]
         create = group openstack-infra-packagers
         pushTag = group openstack-infra-packagers

modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config

@@ -2,8 +2,7 @@
         pushMerge = group openstack-ci-core
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
+        label-Workflow = -1..+1 group openstack-ci-core
-        workInProgress = group openstack-ci-core
 [access "refs/tags/*"]
         create = group openstack-ci-core
         pushTag = group openstack-ci-core

modules/openstack_project/files/gerrit/acls/openstack/api-site.config

@@ -1,12 +1,11 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-doc-core
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
-        workInProgress = group openstack-doc-core
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group openstack-doc-core
         label-Code-Review = -1..+1 group Registered Users
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
-        label-Approved = +0..+1 group ceilometer-core
+        label-Workflow = -1..+1 group ceilometer-core
         label-Code-Review = -2..+2 group ceilometer-core
-        workInProgress = group ceilometer-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group ceilometer-milestone
-        label-Approved = +0..+1 group ceilometer-milestone
+        label-Workflow = -1..+1 group ceilometer-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/cinder.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group cinder-core
-        label-Approved = +0..+1 group cinder-core
+        label-Workflow = -1..+1 group cinder-core
-        workInProgress = group cinder-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group cinder-milestone
-        label-Approved = +0..+1 group cinder-milestone
+        label-Workflow = -1..+1 group cinder-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/cliff.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group cliff-core
-        label-Approved = +0..+1 group cliff-core
+        label-Workflow = -1..+1 group cliff-core
-        workInProgress = group cliff-core
 [access "refs/tags/*"]
         create = group cliff-ptl
         pushTag = group cliff-ptl

modules/openstack_project/files/gerrit/acls/openstack/compute-api.config

@@ -2,8 +2,7 @@
         inheritFrom = API-Projects
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group nova-core
-        label-Approved = +0..+1 group nova-core
+        label-Workflow = -1..+1 group nova-core
-        workInProgress = group nova-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/database-api.config

@@ -4,8 +4,7 @@
         owner = group Administrators
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group trove-core
-        label-Approved = +0..+1 group trove-core
+        label-Workflow = -1..+1 group trove-core
-        workInProgress = group trove-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/diskimage-builder.config

@@ -5,8 +5,7 @@
    mergeContent = true
 [access "refs/heads/*"]
    label-Code-Review = -2..+2 group diskimage-builder-core
-   label-Approved = +0..+1 group diskimage-builder-core
+   label-Workflow = -1..+1 group diskimage-builder-core
-   workInProgress = group diskimage-builder-core
 [access "refs/tags/*"]
    create = group tripleo-ptl
    pushTag = group tripleo-ptl

modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group horizon-core
-        label-Approved = +0..+1 group horizon-core
+        label-Workflow = -1..+1 group horizon-core
-        workInProgress = group horizon-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group horizon-milestone
-        label-Approved = +0..+1 group horizon-milestone
+        label-Workflow = -1..+1 group horizon-milestone
 [access "refs/tags/*"]
         create = group horizon-ptl
         pushTag = group horizon-ptl

modules/openstack_project/files/gerrit/acls/openstack/gantt.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group gantt-core
-        label-Approved = +0..+1 group gantt-core
+        label-Workflow = -1..+1 group gantt-core
-        workInProgress = group gantt-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group gantt-milestone
-        label-Approved = +0..+1 group gantt-milestone
+        label-Workflow = -1..+1 group gantt-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/glance.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group glance-core
-        label-Approved = +0..+1 group glance-core
+        label-Workflow = -1..+1 group glance-core
-        workInProgress = group glance-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group glance-milestone
-        label-Approved = +0..+1 group glance-milestone
+        label-Workflow = -1..+1 group glance-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/governance.config

@@ -1,9 +1,8 @@
 [access "refs/heads/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -1..+1 group tech-committee
         label-Code-Review = -1..+2 group tech-committee-chair
-        label-Approved = +0..+1 group tech-committee-chair
+        label-Workflow = -1..+1 group tech-committee-chair
-        workInProgress = group tech-committee
 [access "refs/tags/*"]
         create = group tech-committee-chair
         pushTag = group tech-committee-chair

modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group heat-core
-        label-Approved = +0..+1 group heat-core
+        label-Workflow = -1..+1 group heat-core
-        workInProgress = group heat-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group heat-milestone
-        label-Approved = +0..+1 group heat-milestone
+        label-Workflow = -1..+1 group heat-milestone
 [access "refs/tags/*"]
         create = group heat-ptl
         pushTag = group heat-ptl

modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group heat-core
-        label-Approved = +0..+1 group heat-core
+        label-Workflow = -1..+1 group heat-core
-        workInProgress = group heat-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group heat-milestone
-        label-Approved = +0..+1 group heat-milestone
+        label-Workflow = -1..+1 group heat-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/heat.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group heat-core
-        label-Approved = +0..+1 group heat-core
+        label-Workflow = -1..+1 group heat-core
-        workInProgress = group heat-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group heat-milestone
-        label-Approved = +0..+1 group heat-milestone
+        label-Workflow = -1..+1 group heat-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/horizon.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group horizon-core
-        label-Approved = +0..+1 group horizon-core
+        label-Workflow = -1..+1 group horizon-core
-        workInProgress = group horizon-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group horizon-milestone
-        label-Approved = +0..+1 group horizon-milestone
+        label-Workflow = -1..+1 group horizon-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/identity-api.config

@@ -2,8 +2,7 @@
         inheritFrom = API-Projects
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group keystone-core
-        label-Approved = +0..+1 group keystone-core
+        label-Workflow = -1..+1 group keystone-core
-        workInProgress = group keystone-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/image-api.config

@@ -2,8 +2,7 @@
         inheritFrom = API-Projects
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group glance-core
-        label-Approved = +0..+1 group glance-core
+        label-Workflow = -1..+1 group glance-core
-        workInProgress = group glance-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/ironic-python-agent.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group ironic-python-agent-core
-        label-Approved = +0..+1 group ironic-python-agent-core
+        label-Workflow = -1..+1 group ironic-python-agent-core
-        workInProgress = group ironic-python-agent-core
 [access "refs/tags/*"]
         create = group ironic-ptl
         pushTag = group ironic-ptl

modules/openstack_project/files/gerrit/acls/openstack/ironic.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group ironic-core
-        label-Approved = +0..+1 group ironic-core
+        label-Workflow = -1..+1 group ironic-core
-        workInProgress = group ironic-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group ironic-milestone
-        label-Approved = +0..+1 group ironic-milestone
+        label-Workflow = -1..+1 group ironic-milestone
 [receive]
         requireChangeId = true
         requireContributorAgreement = true

modules/openstack_project/files/gerrit/acls/openstack/keystone.config

@@ -2,11 +2,10 @@
         pushMerge = group keystone-milestone
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group keystone-core
-        label-Approved = +0..+1 group keystone-core
+        label-Workflow = -1..+1 group keystone-core
-        workInProgress = group keystone-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group keystone-milestone
-        label-Approved = +0..+1 group keystone-milestone
+        label-Workflow = -1..+1 group keystone-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/marconi.config

@@ -2,8 +2,7 @@
         owner = group Administrators
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group marconi-core
-        label-Approved = +0..+1 group marconi-core
+        label-Workflow = -1..+1 group marconi-core
-        workInProgress = group marconi-core
 [receive]
         requireChangeId = true
         requireContributorAgreement = true

modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config

@@ -2,8 +2,7 @@
         inheritFrom = API-Projects
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group neutron-core
-        label-Approved = +0..+1 group neutron-core
+        label-Workflow = -1..+1 group neutron-core
-        workInProgress = group neutron-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/neutron-specs.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group neutron-specs-core
-        label-Approved = +0..+1 group neutron-specs-core
+        label-Workflow = -1..+1 group neutron-specs-core
-        workInProgress = group neutron-specs-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/neutron.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group neutron-core
-        label-Approved = +0..+1 group neutron-core
+        label-Workflow = -1..+1 group neutron-core
-        workInProgress = group neutron-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group neutron-milestone
-        label-Approved = +0..+1 group neutron-milestone
+        label-Workflow = -1..+1 group neutron-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/nova-specs.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group nova-specs-core
-        label-Approved = +0..+1 group nova-specs-core
+        label-Workflow = -1..+1 group nova-specs-core
-        workInProgress = group nova-specs-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/nova.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group nova-core
-        label-Approved = +0..+1 group nova-core
+        label-Workflow = -1..+1 group nova-core
-        workInProgress = group nova-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group nova-milestone
-        label-Approved = +0..+1 group nova-milestone
+        label-Workflow = -1..+1 group nova-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/object-api.config

@@ -2,8 +2,7 @@
         inheritFrom = API-Projects
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group swift-core
-        label-Approved = +0..+1 group swift-core
+        label-Workflow = -1..+1 group swift-core
-        workInProgress = group swift-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack-chef.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-deploy-core
-        label-Approved = +0..+1 group openstack-deploy-core
+        label-Workflow = -1..+1 group openstack-deploy-core
-        workInProgress = group openstack-deploy-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config

@@ -1,18 +1,17 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-doc-core
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
-        workInProgress = group openstack-doc-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group openstack-doc-core
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
 [access "refs/tags/*"]
         create = group openstack-doc-ptl
         pushTag = group openstack-doc-ptl
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group openstack-doc-core
         label-Code-Review = -1..+1 group Registered Users
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config

@@ -1,12 +1,11 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-doc-core
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
-        workInProgress = group openstack-doc-core
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group openstack-doc-core
         label-Code-Review = -1..+1 group Registered Users
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-planet-core
-        label-Approved = +0..+1 group openstack-planet-core
+        label-Workflow = -1..+1 group openstack-planet-core
-        workInProgress = group openstack-planet-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-deploy-core
-        label-Approved = +0..+1 group openstack-deploy-core
+        label-Workflow = -1..+1 group openstack-deploy-core
-        workInProgress = group openstack-deploy-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack-security-notes.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-security-notes-core
-        label-Approved = +0..+1 group openstack-security-notes-core
+        label-Workflow = -1..+1 group openstack-security-notes-core
-        workInProgress = group openstack-security-notes-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/openstack.config

@@ -2,15 +2,14 @@
         exclsiveGroupPermissions = Push
         push = group Release Managers
 [access "refs/heads/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group Release Managers
-        label-Approved = +0..+1 group Release Managers
+        label-Workflow = -1..+1 group Release Managers
         label-Code-Review = -1..+1 group Registered Users
-        workInProgress = group Release Managers
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group Release Managers
-        label-Approved = +0..+1 group Release Managers
+        label-Workflow = -1..+1 group Release Managers
         label-Code-Review = -1..+1 group Registered Users
 [project]
         state = active

modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config

@@ -2,13 +2,12 @@
         pushMerge = group openstack-doc-ptl
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-doc-core
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
-        workInProgress = group openstack-doc-core
 [access "refs/heads/stable/*"]
-        exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Workflow
         label-Code-Review = -2..+2 group openstack-doc-core
         label-Code-Review = -1..+1 group Registered Users
-        label-Approved = +0..+1 group openstack-doc-core
+        label-Workflow = -1..+1 group openstack-doc-core
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/os-apply-config.config

@@ -7,8 +7,7 @@
    mergeContent = true
 [access "refs/heads/*"]
    label-Code-Review = -2..+2 group os-apply-config-core
-   label-Approved = +0..+1 group os-apply-config-core
+   label-Workflow = -1..+1 group os-apply-config-core
-   workInProgress = group os-apply-config-core
 [access "refs/tags/*"]
    create = group tripleo-ptl
    pushTag = group tripleo-ptl

modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config

@@ -7,8 +7,7 @@
    mergeContent = true
 [access "refs/heads/*"]
    label-Code-Review = -2..+2 group os-apply-config-core
-   label-Approved = +0..+1 group os-apply-config-core
+   label-Workflow = -1..+1 group os-apply-config-core
-   workInProgress = group os-apply-config-core
 [access "refs/tags/*"]
    create = group tripleo-ptl
    pushTag = group tripleo-ptl

modules/openstack_project/files/gerrit/acls/openstack/os-collect-config.config

@@ -7,8 +7,7 @@
    mergeContent = true
 [access "refs/heads/*"]
    label-Code-Review = -2..+2 group os-apply-config-core
-   label-Approved = +0..+1 group os-apply-config-core
+   label-Workflow = -1..+1 group os-apply-config-core
-   workInProgress = group os-apply-config-core
 [access "refs/tags/*"]
    create = group tripleo-ptl
    pushTag = group tripleo-ptl

modules/openstack_project/files/gerrit/acls/openstack/os-refresh-config.config

@@ -7,8 +7,7 @@
    mergeContent = true
 [access "refs/heads/*"]
    label-Code-Review = -2..+2 group os-apply-config-core
-   label-Approved = +0..+1 group os-apply-config-core
+   label-Workflow = -1..+1 group os-apply-config-core
-   workInProgress = group os-apply-config-core
 [access "refs/tags/*"]
    create = group tripleo-ptl
    pushTag = group tripleo-ptl

modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-core
-        label-Approved = +0..+1 group oslo-core
+        label-Workflow = -1..+1 group oslo-core
-        workInProgress = group oslo-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-milestone
-        label-Approved = +0..+1 group oslo-milestone
+        label-Workflow = -1..+1 group oslo-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-core
-        label-Approved = +0..+1 group oslo-core
+        label-Workflow = -1..+1 group oslo-core
-        workInProgress = group oslo-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-milestone
-        label-Approved = +0..+1 group oslo-milestone
+        label-Workflow = -1..+1 group oslo-milestone
 [access "refs/tags/*"]
         create = group oslo-core
         pushTag = group oslo-core

modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-messaging-core
-        label-Approved = +0..+1 group oslo-messaging-core
+        label-Workflow = -1..+1 group oslo-messaging-core
-        workInProgress = group oslo-messaging-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-milestone
-        label-Approved = +0..+1 group oslo-milestone
+        label-Workflow = -1..+1 group oslo-milestone
 [project]
         state = active
 [receive]

modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-rootwrap-core
-        label-Approved = +0..+1 group oslo-rootwrap-core
+        label-Workflow = -1..+1 group oslo-rootwrap-core
-        workInProgress = group oslo-rootwrap-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-rootwrap-milestone
-        label-Approved = +0..+1 group oslo-rootwrap-milestone
+        label-Workflow = -1..+1 group oslo-rootwrap-milestone
 [access "refs/tags/*"]
         create = group oslo-rootwrap-core
         pushTag = group oslo-rootwrap-core

modules/openstack_project/files/gerrit/acls/openstack/oslo.test.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-core
-        label-Approved = +0..+1 group oslo-core
+        label-Workflow = -1..+1 group oslo-core
-        workInProgress = group oslo-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-milestone
-        label-Approved = +0..+1 group oslo-milestone
+        label-Workflow = -1..+1 group oslo-milestone
 [access "refs/tags/*"]
         create = group oslo-core
         pushTag = group oslo-core

modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-core
-        label-Approved = +0..+1 group oslo-core
+        label-Workflow = -1..+1 group oslo-core
-        workInProgress = group oslo-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-milestone
-        label-Approved = +0..+1 group oslo-milestone
+        label-Workflow = -1..+1 group oslo-milestone
 [access "refs/tags/*"]
         create = group oslo-core
         pushTag = group oslo-core

modules/openstack_project/files/gerrit/acls/openstack/oslo.vmware.config

@@ -1,7 +1,6 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-vmware-core
-        label-Approved = +0..+1 group oslo-vmware-core
+        label-Workflow = -1..+1 group oslo-vmware-core
-        workInProgress = group oslo-vmware-core
 [access "refs/tags/*"]
         create = group oslo-vmware-milestone
         pushTag = group oslo-vmware-milestone

modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group oslo-core
-        label-Approved = +0..+1 group oslo-core
+        label-Workflow = -1..+1 group oslo-core
-        workInProgress = group oslo-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group oslo-milestone
-        label-Approved = +0..+1 group oslo-milestone
+        label-Workflow = -1..+1 group oslo-milestone
 [access "refs/tags/*"]
         create = group oslo-core
         pushTag = group oslo-core

modules/openstack_project/files/gerrit/acls/openstack/pycadf.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group pycadf-core
-        label-Approved = +0..+1 group pycadf-core
+        label-Workflow = -1..+1 group pycadf-core
-        workInProgress = group pycadf-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group pycadf-milestone
-        label-Approved = +0..+1 group pycadf-milestone
+        label-Workflow = -1..+1 group pycadf-milestone
 [access "refs/tags/*"]
         create = group pycadf-core
         pushTag = group pycadf-core

modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group ceilometer-core
-        label-Approved = +0..+1 group ceilometer-core
+        label-Workflow = -1..+1 group ceilometer-core
-        workInProgress = group ceilometer-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group ceilometer-milestone
-        label-Approved = +0..+1 group ceilometer-milestone
+        label-Workflow = -1..+1 group ceilometer-milestone
 [access "refs/tags/*"]
         create = group ceilometer-ptl
         pushTag = group ceilometer-ptl