Change from Jenkins => Zuul

Change-Id: Icdd2507fd34fa50207bcbab43a1bfd9197b1531b
4 years ago · 32fde83b8e
65 changed files with 210 additions and 210 deletions
--- a/README.rst
+++ b/README.rst
@ -40,7 +40,7 @@ It's super easy, just check out the code, and pass 1 argument, which is
 the dashboard file you want the URL for::

  $ ./gerrit-dash-creator dashboards/devstack.dash
-  https://review.openstack.org/#/dashboard/?foreach=%28project%3Aopenstack%2Ddev%2Fdevstack+OR+project%3Aopenstack%2Ddev%2Fdevstack%2Dvagrant+OR+project%3Aopenstack%2Ddev%2Fbashate+OR+project%3Aopenstack%2Ddev%2Fgrenade%29+status%3Aopen+NOT+owner%3Aself+NOT+label%3AWorkflow%3C%3D%2D1+label%3AVerified%3E%3D1%2Cjenkins+NOT+label%3ACode%2DReview%3E%3D0%2Cself&title=Devstack+Review+Inbox&Needs+Feedback+%28Changes+older+than+5+days+that+have+not+been+reviewed+by+anyone%29=NOT+label%3ACode%2DReview%3C%3D2+age%3A5d&You+are+a+reviewer%2C+but+haven%27t+voted+in+the+current+revision=NOT+label%3ACode%2DReview%3C%3D2%2Cself+reviewer%3Aself&Needs+final+%2B2=label%3ACode%2DReview%3E%3D2+limit%3A50+NOT+label%3ACode%2DReview%3C%3D%2D1%2Cself&Passed+Jenkins%2C+No+Negative+Feedback=NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3ACode%2DReview%3C%3D%2D1+limit%3A50&Wayward+Changes+%28Changes+with+no+code+review+in+the+last+2days%29=NOT+label%3ACode%2DReview%3C%3D2+age%3A2d
+  https://review.openstack.org/#/dashboard/?foreach=%28project%3Aopenstack%2Ddev%2Fdevstack+OR+project%3Aopenstack%2Ddev%2Fdevstack%2Dvagrant+OR+project%3Aopenstack%2Ddev%2Fbashate+OR+project%3Aopenstack%2Ddev%2Fgrenade%29+status%3Aopen+NOT+owner%3Aself+NOT+label%3AWorkflow%3C%3D%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D0%2Cself&title=Devstack+Review+Inbox&Needs+Feedback+%28Changes+older+than+5+days+that+have+not+been+reviewed+by+anyone%29=NOT+label%3ACode%2DReview%3C%3D2+age%3A5d&You+are+a+reviewer%2C+but+haven%27t+voted+in+the+current+revision=NOT+label%3ACode%2DReview%3C%3D2%2Cself+reviewer%3Aself&Needs+final+%2B2=label%3ACode%2DReview%3E%3D2+limit%3A50+NOT+label%3ACode%2DReview%3C%3D%2D1%2Cself&Passed+Zuul%2C+No+Negative+Feedback=NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3ACode%2DReview%3C%3D%2D1+limit%3A50&Wayward+Changes+%28Changes+with+no+code+review+in+the+last+2days%29=NOT+label%3ACode%2DReview%3C%3D2+age%3A2d

 Then put the URL in your browser and off you go.

--- a/dashboards/all-the-specs.dash
+++ b/dashboards/all-the-specs.dash
@ -1,12 +1,12 @@
 [dashboard]
 title = All the Specs
 description = Review Inbox
-foreach = project:^openstack/.*-specs status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:master
+foreach = project:^openstack/.*-specs status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:master

 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review<=-1 limit:100

 [section "Wayward Changes (Changes with no code review in the last 7 days)"]
--- a/dashboards/api-docs-impact.dash
+++ b/dashboards/api-docs-impact.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = API Docs Review Inbox
 description = Review Inbox for OpenStack API Docs
-foreach = (project:openstack/api-site) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self
+foreach = (project:openstack/api-site) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self


 [section "Needs feedback (Changes older than 5 days that have not been reviewed by anyone)"]
--- a/dashboards/api-wg.dash
+++ b/dashboards/api-wg.dash
@ -4,7 +4,7 @@ description = Reviews for OpenStack API Working Group
 foreach = project:openstack/api-wg status:open NOT label:Workflow=+1

 [section "Ready to freeze"]
-query = label:Verified>=1,jenkins NOT label:Code-Review<=-1 NOT label:Workflow<=-1 age:2d
+query = label:Verified>=1,zuul NOT label:Code-Review<=-1 NOT label:Workflow<=-1 age:2d

 [section "Frozen"]
 query = label:Code-Review=+2
--- a/dashboards/app-catalog.dash
+++ b/dashboards/app-catalog.dash
@ -7,19 +7,19 @@ foreach = (project:openstack/app-catalog OR project:openstack/app-catalog-ui) st
 query = owner:self status:open

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 branch:master

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "Without Negative Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50 branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50 branch:master

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20 branch:master
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20 branch:master

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d branch:master

 [section "Work In Progress"]
 query = NOT label:Workflow>=1 NOT owner:self label:Workflow<=-1 limit:20 branch:master
--- a/dashboards/chef_watched.dash
+++ b/dashboards/chef_watched.dash
@ -10,22 +10,22 @@ query = owner:self status:open
 query = NOT owner:self project:openstack/openstack-chef-specs

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "Not Reviewed by Me"]
 query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self limit:50

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/openstack-chef-specs NOT label:Code-Review<=2 age:5d
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/openstack-chef-specs NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/openstack-chef-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/openstack-chef-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20

 [section "Work In Progress"]
 query = NOT label:Workflow>=1 NOT owner:self label:Workflow<=-1
--- a/dashboards/cloud-init.dash
+++ b/dashboards/cloud-init.dash
@ -7,19 +7,19 @@ foreach = (project:openstack/cloud-init) status:open NOT label:Code-Review<=-2
 query = owner:self status:open

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 branch:master

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "Without Negative Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50 branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50 branch:master

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20 branch:master
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20 branch:master

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d branch:master

 [section "Work In Progress"]
 query = NOT label:Workflow>=1 NOT owner:self label:Workflow<=-1 limit:20 branch:master
--- a/dashboards/compute-drivers.dash
+++ b/dashboards/compute-drivers.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Nova Drivers Priorities
 description = Review Inbox
-foreach = project:openstack/nova status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self NOT label:Code-Review<=-1,nova-core branch:master is:mergeable
+foreach = project:openstack/nova status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self NOT label:Code-Review<=-1,nova-core branch:master is:mergeable

 [section "HyperV"]
 query = label:Code-Review>=1,cbelu@cloudbasesolutions.com file:hyperv
--- a/dashboards/compute-program.dash
+++ b/dashboards/compute-program.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Nova Review Inbox (master branch only)
 description = Review Inbox
-foreach = (project:openstack/nova OR project:openstack/python-novaclient) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:master is:mergeable
+foreach = (project:openstack/nova OR project:openstack/python-novaclient) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:master is:mergeable

 [section "Needs final +2"]
 query = NOT label:Code-Review<=-1,nova-core label:Code-Review>=2
@ -15,10 +15,10 @@ query = NOT label:Code-Review<=-1 NOT label:Code-Review>=1 NOT is:reviewed age:5
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1,nova-core message:"Closes-Bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1,nova-core NOT message:"Closes-Bug: "

 [section "Wayward Changes (Changes with no code review in the last 5 days)"]
--- a/dashboards/designate.dash
+++ b/dashboards/designate.dash
@ -11,16 +11,16 @@ query = branch:stable/mitaka NOT reviewedby:self
 query = branch:stable/liberty NOT reviewedby:self

 [section "You are a reviewer, but haven't voted in the current revision"]
-query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self label:Verified>=1,jenkins NOT owner:self
+query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self label:Verified>=1,zuul NOT owner:self

 [section "Needs final +2"]
-query = label:Code-Review>=2 label:Verified>=1,jenkins limit:50 NOT label:Workflow<=-1 NOT label:Workflow>=1 NOT label:Code-Review>=2,self NOT owner:self
+query = label:Code-Review>=2 label:Verified>=1,zuul limit:50 NOT label:Workflow<=-1 NOT label:Workflow>=1 NOT label:Code-Review>=2,self NOT owner:self

-[section "+1'd and passed Jenkins"]
-query = label:Verified>=1,jenkins label:Code-Review>=1 NOT label:Code-Review<=-1 limit:50 NOT label:Workflow<=-1 NOT owner:self NOT reviewedby:self
+[section "+1'd and passed Zuul"]
+query = label:Verified>=1,zuul label:Code-Review>=1 NOT label:Code-Review<=-1 limit:50 NOT label:Workflow<=-1 NOT owner:self NOT reviewedby:self

-[section "Passed Jenkins, Need's Review"]
-query = label:Verified>=1,jenkins NOT label:Code-Review<=2 limit:50 NOT label:Workflow<=-1 NOT owner:self
+[section "Passed Zuul, Need's Review"]
+query = label:Verified>=1,zuul NOT label:Code-Review<=2 limit:50 NOT label:Workflow<=-1 NOT owner:self

 [section "My Open Reviews"]
 query = owner:self
--- a/dashboards/devstack.dash
+++ b/dashboards/devstack.dash
@ -3,15 +3,15 @@ title = Devstack Review Inbox
 description = Review Inbox
 # note, we're putting grenade in this review list as well because grenade while part of QA program
 # is closer to a review group with devstack.
-foreach = (project:openstack-dev/devstack OR project:openstack-dev/devstack-vagrant OR project:openstack-dev/grenade) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack-dev/devstack OR project:openstack-dev/devstack-vagrant OR project:openstack-dev/grenade) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50 NOT label:Code-Review<=-1,self

-[section "Passed Jenkins, No Negative Feedback (Small Fixes)"]
+[section "Passed Zuul, No Negative Feedback (Small Fixes)"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1,devstack-core delta:<=10

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1,devstack-core delta:>10

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
--- a/dashboards/doc-program.dash
+++ b/dashboards/doc-program.dash
@ -12,7 +12,7 @@ foreach = ( project:openstack/openstack-manuals OR
           status:open
           NOT owner:self
           NOT label:Workflow<=-1
-           label:Verified>=1,jenkins
+           label:Verified>=1,zuul
           NOT reviewedby:self

 [section "Needs feedback (Changes older than 5 days that have not been reviewed by anyone)"]
@ -36,7 +36,7 @@ query = (project:openstack/openstack-doc-tools OR project:openstack/whereto OR p
 [section "Needs final +2"]
 query = (project:openstack/openstack-manuals OR project:openstack/api-site OR project:openstack/security-doc OR project:openstack/training-guides OR project:openstack/openstack-doc-tools OR project:openstack/whereto OR project:openstack/openstackdocstheme) label:Code-Review>=2 limit:50

-[section "Passed Jenkins (with no negative feedback)"]
+[section "Passed Zuul (with no negative feedback)"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last two days)"]
--- a/dashboards/docimpact.dash
+++ b/dashboards/docimpact.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Cross-project OpenStack Documentation
 description = Review Inbox for all RST Docs and DocImpact flags
-foreach = project:^openstack/.* status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:master
+foreach = project:^openstack/.* status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:master

 [section "DocImpact in commit message"]
 query = message:docimpact
--- a/dashboards/docsux.dash
+++ b/dashboards/docsux.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = User Docs and UX/UI Review Inbox
 description = Review Inbox for OpenStack Documentation
-foreach = (project:openstack/openstack-manuals OR project:openstack/security-doc OR openstack/openstack-ux status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self
+foreach = (project:openstack/openstack-manuals OR project:openstack/security-doc OR openstack/openstack-ux status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self

 [section "Needs feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -15,7 +15,7 @@ query = (project:openstack/openstack-ux) status:open
 [section "Needs final +2"]
 query = (project:openstack/openstack-manuals OR project:openstack/api-site OR project:openstack/object-api OR project:openstack/image-api OR project:openstack/identity-api OR project:openstack/compute-api OR project:openstack/volume-api OR project:openstack/netconn-api OR project:openstack/operations-guide OR project:openstack/security-doc OR project:openstack/training-guides OR project:openstack/ha-guide) label:Code-Review>=2 limit:50

-[section "Passed Jenkins (with no negative feedback)"]
+[section "Passed Zuul (with no negative feedback)"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last two days)"]
--- a/dashboards/fuel-logging-monitoring-alarming.dash
+++ b/dashboards/fuel-logging-monitoring-alarming.dash
@ -19,10 +19,10 @@ query = NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT label:Verified<=-1 NOT
 query = NOT label:Verified<=-1 NOT owner:self NOT project:openstack/fuel-specs label:Code-Review-1 limit:20

 [section "Needs Reverify"]
-query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,jenkins
+query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,zuul

 [section "Work In Progress Or Unverified"]
-query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,jenkins)
+query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,zuul)

 [section "All My Patches "]
 query = owner:self
--- a/dashboards/gate-changes.dash
+++ b/dashboards/gate-changes.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Gate Proposed Changes Review Inbox
 description = Review Inbox
-foreach = (project:openstack-infra/project-config OR project:openstack-infra/devstack-gate) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack-infra/project-config OR project:openstack-infra/devstack-gate) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -12,7 +12,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/heat.dash
+++ b/dashboards/heat.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Heat Review Inbox
 description = Review Inbox
-foreach = (project:openstack-dev/heat-cfnclient OR project:openstack/heat OR project:openstack/heat-cfntools OR project:openstack/heat-specs OR project:openstack/heat-templates OR project:openstack/python-heatclient OR project:openstack/tripleo-heat-templates OR project:openstack/heat-translator OR project:openstack/puppet-heat) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review>=0,self
+foreach = (project:openstack-dev/heat-cfnclient OR project:openstack/heat OR project:openstack/heat-cfntools OR project:openstack/heat-specs OR project:openstack/heat-templates OR project:openstack/python-heatclient OR project:openstack/tripleo-heat-templates OR project:openstack/heat-translator OR project:openstack/puppet-heat) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review>=0,self

 [section "Proposal Bot Proposals"]
 query = owner:"OpenStack Proposal Bot <openstack-infra@lists.openstack.org>"
@ -15,7 +15,7 @@ query = NOT label:Code-Review<=2 age:5d
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=2,self reviewer:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/horizon-related-repos.dash
+++ b/dashboards/horizon-related-repos.dash
@ -10,25 +10,25 @@ query = owner:self
 query = is:starred

 [section "Your are a reviewer, but haven't voted in the current revision"]
-query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self NOT label:Workflow<=-1 label:Verified>=1,jenkins
+query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self NOT label:Workflow<=-1 label:Verified>=1,zuul

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Code-Review<=2,self
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Code-Review<=2,self

 [section "Not Reviewed by Me"]
 query = NOT label:Code-Review<=2,self limit:50

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20

 [section "Work In Progress"]
 query = NOT label:Workflow>=1 NOT owner:self label:Workflow<=-1
--- a/dashboards/horizon-stable.dash
+++ b/dashboards/horizon-stable.dash
@ -2,7 +2,7 @@
 title = Horizon stable branches Review Inbox
 description = Review Inbox
 foreach = (project:openstack/horizon OR
-           project:openstack/django_openstack_auth) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:^stable/.*
+           project:openstack/django_openstack_auth) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:^stable/.*

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -13,7 +13,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:horizon-core label:Code-Review<=-1) limit:50

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:horizon-core label:Code-Review<=-1) limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/horizon.dash
+++ b/dashboards/horizon.dash
@ -11,25 +11,25 @@ query = owner:self
 query = is:starred

 [section "Your are a reviewer, but haven't voted in the current revision"]
-query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self NOT label:Workflow<=-1 label:Verified>=1,jenkins
+query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self NOT label:Workflow<=-1 label:Verified>=1,zuul

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Code-Review<=2,self
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Code-Review<=2,self

 [section "Not Reviewed by Me"]
 query = NOT label:Code-Review<=2,self limit:50

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20

 [section "Work In Progress"]
 query = NOT label:Workflow>=1 NOT owner:self label:Workflow<=-1
--- a/dashboards/ironic-inspector.dash
+++ b/dashboards/ironic-inspector.dash
@ -4,22 +4,22 @@ description = Ironic-Inspector Review Inbox
 foreach = (project:openstack/ironic-inspector OR project:openstack/python-ironic-inspector-client) status:open NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1 OR label:Workflow<=-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1 OR label:Workflow<=-1)

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "Needs Reverify"]
-query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,jenkins
+query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,zuul

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20

 [section "Work In Progress Or Unverified"]
-query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,jenkins) limit:20
+query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,zuul) limit:20
--- a/dashboards/ironic.dash
+++ b/dashboards/ironic.dash
@ -4,22 +4,22 @@ description = Summary of Ironic Patches to Review
 foreach = (project:openstack/ironic OR project:openstack/python-ironicclient OR project:openstack/ironic-python-agent OR project:openstack/ironic-specs OR project:openstack/ironic-lib OR project:openstack/ironic-inspector OR project:openstack/ironic-webclient OR project:openstack/bifrost) status:open NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1 OR label:Workflow<=-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1 OR label:Workflow<=-1)

 [section "Small things (<25 LOC, limit 10)"]
-query = delta:<=25 limit:10 (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent) OR (label:Code-Review-1,ironic-inspector-core AND project:openstack/ironic-inspector)) label:Verified>=1,jenkins branch:master
+query = delta:<=25 limit:10 (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent) OR (label:Code-Review-1,ironic-inspector-core AND project:openstack/ironic-inspector)) label:Verified>=1,zuul branch:master

 [section "Needs Reverify"]
-query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,jenkins
+query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,zuul

 [section "Needs Final Approval (to land on master)"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT owner:self label:Code-Review>=2 label:Verified>=1,jenkins (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent)) NOT project:openstack/ironic-specs branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT owner:self label:Code-Review>=2 label:Verified>=1,zuul (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent)) NOT project:openstack/ironic-specs branch:master

 [section "Newer (<1wk) Open Patches (limit 25)"]
-query = -age:1week limit:25 branch:master NOT label:Workflow>=1 (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent) OR (label:Code-Review-1,ironic-inspector-core AND project:openstack/ironic-inspector)) label:Verified>=1,jenkins NOT label:Code-Review>=2 NOT project:openstack/ironic-specs
+query = -age:1week limit:25 branch:master NOT label:Workflow>=1 (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent) OR (label:Code-Review-1,ironic-inspector-core AND project:openstack/ironic-inspector)) label:Verified>=1,zuul NOT label:Code-Review>=2 NOT project:openstack/ironic-specs

-[section "Older (>1wk) Open Patches Passing Jenkins Tests (limit 50)"]
-query = age:1week limit:50 NOT label:Workflow>=1 NOT label:Code-Review<=2 age:1week NOT label:Verified>=1,jenkins NOT project:openstack/ironic-specs (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent) OR (label:Code-Review-1,ironic-inspector-core AND project:openstack/ironic-inspector))
+[section "Older (>1wk) Open Patches Passing Zuul Tests (limit 50)"]
+query = age:1week limit:50 NOT label:Workflow>=1 NOT label:Code-Review<=2 age:1week NOT label:Verified>=1,zuul NOT project:openstack/ironic-specs (NOT label:Code-Review-1,ironic-core OR (label:Code-Review-1,ironic-python-agent-core AND project:openstack/ironic-python-agent) OR (label:Code-Review-1,ironic-inspector-core AND project:openstack/ironic-inspector))

 [section "Open Stable Backports"]
 query = NOT project:openstack/ironic-specs branch:^stable/.* status:open
--- a/dashboards/kolla.dash
+++ b/dashboards/kolla.dash
@ -6,17 +6,17 @@ foreach = (project:openstack/kolla OR
           project:openstack/kolla-kubernetes) status:open NOT label:Workflow<=-1 NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1)

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d
+query = label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "Other"]
-query = label:Verified>=1,jenkins NOT owner:self  label:Code-Review-1 limit:20
+query = label:Verified>=1,zuul NOT owner:self  label:Code-Review-1 limit:20

--- a/dashboards/magnum.dash
+++ b/dashboards/magnum.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Magnum Review Inbox
 description = Review Inbox
-foreach = (project:openstack/magnum OR project:openstack/python-magnumclient ) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review>=0,self
+foreach = (project:openstack/magnum OR project:openstack/python-magnumclient ) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review>=0,self

 [section "Proposal Bot Proposals"]
 query = owner:"OpenStack Proposal Bot <openstack-infra@lists.openstack.org>"
@ -15,7 +15,7 @@ query = NOT label:Code-Review<=2 age:5d
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=2,self reviewer:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/monasca.dash
+++ b/dashboards/monasca.dash
@ -7,19 +7,19 @@ foreach = (project:openstack/monasca-agent OR project:openstack/monasca-api OR p
 query = owner:self status:open

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 branch:master

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "Without Negative Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50 branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50 branch:master

 [section "With Negative Feedback"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self label:Code-Review-1 limit:20 branch:master
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self label:Code-Review-1 limit:20 branch:master

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d branch:master
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d branch:master

 [section "Work In Progress"]
 query = NOT label:Workflow>=1 NOT owner:self label:Workflow<=-1 limit:20 branch:master
--- a/dashboards/murano.dash
+++ b/dashboards/murano.dash
@ -12,7 +12,7 @@ query = NOT label:Code-Review<=2,self reviewer:self NOT owner:self
 [section "Need Feedback"]
 query = NOT label:Code-Review<=2 NOT label:Verified<=-1 NOT owner:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = label:Code-Review>=1 NOT label:Code-Review<=-1 AND NOT label:Verified<=-1 NOT owner:self NOT reviewer:self limit:50

 [section "Maybe Review?"]
--- a/dashboards/networking-cisco.dash
+++ b/dashboards/networking-cisco.dash
@ -4,16 +4,16 @@ description = Open Reviews
 foreach = project:openstack/networking-cisco (status:open OR status:merged)

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "Needs Reverify"]
-query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,jenkins NOT owner:self
+query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,zuul NOT owner:self

 [section "No Negative Feedback (top 10)"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:10
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:10

 [section "Everything else, Not WIP (top 10)"]
-query = NOT label:Code-Review-2 (label:Code-Review<=-1 OR label:Verified<=-1,jenkins) NOT label:Workflow<=-1 NOT label:Workflow>=1 NOT owner:self limit:10
+query = NOT label:Code-Review-2 (label:Code-Review<=-1 OR label:Verified<=-1,zuul) NOT label:Workflow<=-1 NOT label:Workflow>=1 NOT owner:self limit:10

 [section "Recently Approved (top 10)"]
 query = label:Workflow>=1 limit:10
--- a/dashboards/networking-midonet.dash
+++ b/dashboards/networking-midonet.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Networking-MidoNet Review Inbox
 description = Review Inbox
-foreach = (project:openstack/networking-midonet) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack/networking-midonet) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d branch:master
@ -12,7 +12,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:networking-midonet-core label:Code-Review<=-1) limit:50 branch:master

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:networking-midonet-core label:Code-Review<=-1) limit:50 branch:master

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/neutron-infra.dash
+++ b/dashboards/neutron-infra.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Neutron Infra Review Inbox
 description = Neutron Infra Review Inbox
-foreach = (project:openstack-infra/project-config OR project:openstack-infra/openstack-zuul-jobs OR project:openstack-infra/devstack-gate) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack-infra/project-config OR project:openstack-infra/openstack-zuul-jobs OR project:openstack-infra/devstack-gate) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "Neutron related infra reviews"]
 # The following query is intended to match with comments
--- a/dashboards/neutron-subprojects-stable.dash
+++ b/dashboards/neutron-subprojects-stable.dash
@ -13,7 +13,7 @@ foreach = (
    project:openstack/neutron-fwaas OR
    project:openstack/neutron-lib OR
    project:openstack/ovsdbapp OR
-    project:openstack/python-neutronclient) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:^stable/.*
+    project:openstack/python-neutronclient) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:^stable/.*

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -24,7 +24,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:neutron-stable-maint label:Code-Review<=-1) limit:50

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:neutron-stable-maint label:Code-Review<=-1) limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/neutron-subprojects.dash
+++ b/dashboards/neutron-subprojects.dash
@ -10,7 +10,7 @@ foreach = (
    project:openstack/networking-sfc OR
    project:openstack/neutron-dynamic-routing OR
    project:openstack/neutron-fwaas OR
-    project:openstack/ovsdbapp) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:master
+    project:openstack/ovsdbapp) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:master

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -21,7 +21,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:neutron-core label:Code-Review<=-1) limit:50

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:neutron-core label:Code-Review<=-1) limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/neutron.dash
+++ b/dashboards/neutron.dash
@ -5,7 +5,7 @@ foreach = (project:openstack/neutron OR
           project:openstack/neutron-lib OR
           project:openstack/python-neutronclient OR
           project:openstack/neutron-specs)
-          status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:master
+          status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:master

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -16,7 +16,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:neutron-core label:Code-Review<=-1) limit:50

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:neutron-core label:Code-Review<=-1) limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/new-contributors.dash
+++ b/dashboards/new-contributors.dash
@ -3,17 +3,17 @@ title = Reviews from New Contributors
 description = Reviews from New Contributors
 foreach = reviewer:"Welcome, new contributor!" status:open NOT owner:self NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self NOT project:openstack-dev/sandbox

-[section "Failed Jenkins, may need help debugging"]
-query = label:Verified<1,jenkins
+[section "Failed Zuul, may need help debugging"]
+query = label:Verified<1,zuul

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
-query = NOT label:Code-Review<=2 age:5d label:Verified>=1,jenkins
+query = NOT label:Code-Review<=2 age:5d label:Verified>=1,zuul

 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50

-[section "Passed Jenkins, No Negative Feedback"]
-query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 label:Verified>=1,jenkins limit:50
+[section "Passed Zuul, No Negative Feedback"]
+query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 label:Verified>=1,zuul limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
-query = NOT label:Code-Review<=2 age:2d label:Verified>=1,jenkins
+query = NOT label:Code-Review<=2 age:2d label:Verified>=1,zuul
--- a/dashboards/nova-api.dash
+++ b/dashboards/nova-api.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Nova API
 description = Review Inbox
-foreach = (project:openstack/nova OR project:openstack/python-novaclient OR project:openstack/nova-specs) ((file:^.*nova/api.* OR file:^.*api_samples.* OR file:api-guide OR file:api-ref) OR message:apiimpact OR topic:bp/remove-legacy-v2-api-code) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack/nova OR project:openstack/python-novaclient OR project:openstack/nova-specs) ((file:^.*nova/api.* OR file:^.*api_samples.* OR file:api-guide OR file:api-ref) OR message:apiimpact OR topic:bp/remove-legacy-v2-api-code) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "API Ref Updates"]
 query = project:openstack/nova file:api-ref NOT reviewedby:self
@ -21,7 +21,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Down voted changes"]
--- a/dashboards/nova-specs.dash
+++ b/dashboards/nova-specs.dash
@ -4,19 +4,19 @@ description = Review Inbox
 foreach = project:openstack/nova-specs status:open NOT label:Workflow<=-1 branch:master NOT owner:self

 [section "You are a reviewer, but haven't voted in the current revision"]
-query = file:^specs/queens/.* NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self label:Verified>=1,jenkins
+query = file:^specs/queens/.* NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self label:Verified>=1,zuul

 [section "Not blocked by -2s"]
-query = file:^specs/queens/.* NOT label:Code-Review<=-2 NOT label:Code-Review>=2 NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self label:Verified>=1,jenkins
+query = file:^specs/queens/.* NOT label:Code-Review<=-2 NOT label:Code-Review>=2 NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self label:Verified>=1,zuul

 [section "No votes and spec is > 1 week old"]
-query = file:^specs/queens/.* NOT label:Code-Review>=-2 age:7d label:Verified>=1,jenkins
+query = file:^specs/queens/.* NOT label:Code-Review>=-2 age:7d label:Verified>=1,zuul

 [section "Needs final +2"]
-query = file:^specs/queens/.* label:Code-Review>=2 NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self label:Verified>=1,jenkins
+query = file:^specs/queens/.* label:Code-Review>=2 NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self label:Verified>=1,zuul

-[section "Broken Specs (doesn't pass Jenkins)"]
-query = file:^specs/queens/.* label:Verified<=-1,jenkins
+[section "Broken Specs (doesn't pass Zuul)"]
+query = file:^specs/queens/.* label:Verified<=-1,zuul

 [section "Dead Specs (blocked by a -2)"]
 query = file:^specs/queens/.* label:Code-Review<=-2
--- a/dashboards/nova.dash
+++ b/dashboards/nova.dash
@ -9,7 +9,7 @@ foreach = ( project:openstack/nova OR
           status:open
           NOT owner:self
           NOT label:Workflow<=-1
-           label:Verified>=1,jenkins
+           label:Verified>=1,zuul
           NOT reviewedby:self
           branch:master

@ -19,7 +19,7 @@ query = (project:openstack/nova OR project:openstack/python-novaclient OR projec
 [section "Needs final +2"]
 query = (project:openstack/nova OR project:openstack/python-novaclient OR project:openstack/os-vif OR project:openstack/os-traits) NOT label:Code-Review>=2,self label:Code-Review>=2 limit:50

-[section "Bug fix, Passed Jenkins, No Negative Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Feedback"]
 query =  NOT label:Code-Review>=2,self NOT label:Code-Review<=-1,nova-core message:"bug: " limit:50

 [section "Wayward Changes (Changes with no code review in the last two days)"]
@ -28,7 +28,7 @@ query = NOT label:Code-Review<=2 age:2d limit:50
 [section "Needs feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d limit:50

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Needs revisit (You were a reviewer but haven't voted in the current revision)"]
--- a/dashboards/octavia.dash
+++ b/dashboards/octavia.dash
@ -7,19 +7,19 @@ foreach = (project:openstack/octavia OR
           NOT owner:self NOT label:Workflow<=-1

 [section "Needs final +2"]
-query = label:Verified>=1,jenkins label:Code-Review>=2 NOT(reviewerin:octavia-core label:Code-Review<=-1 OR label:Workflow>=1) limit:50
+query = label:Verified>=1,zuul label:Code-Review>=2 NOT(reviewerin:octavia-core label:Code-Review<=-1 OR label:Workflow>=1) limit:50

 [section "You are a reviewer, but haven't voted in the current revision"]
-query = label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self NOT label:Workflow<=-1 label:Verified>=1,jenkins limit:50
+query = label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self NOT label:Workflow<=-1 label:Verified>=1,zuul limit:50

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
-query = label:Verified>=1,jenkins NOT label:Code-Review<=2 age:5d limit:10
+query = label:Verified>=1,zuul NOT label:Code-Review<=2 age:5d limit:10

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
-query = label:Verified>=1,jenkins NOT label:Code-Review<=2 age:2d NOT label:Workflow<=-1 NOT reviewedby:self limit:10
+query = label:Verified>=1,zuul NOT label:Code-Review<=2 age:2d NOT label:Workflow<=-1 NOT reviewedby:self limit:10

-[section "Passed Jenkins, No Negative Core Feedback"]
-query = label:Verified>=1,jenkins NOT label:Workflow<=-1 NOT label:Code-Review>=2 NOT(reviewerin:octavia-core label:Code-Review<=-1) limit:10
+[section "Passed Zuul, No Negative Core Feedback"]
+query = label:Verified>=1,zuul NOT label:Workflow<=-1 NOT label:Code-Review>=2 NOT(reviewerin:octavia-core label:Code-Review<=-1) limit:10

 [section "In merge"]
 query = label:Code-Review>=2,octavia-core label:Workflow>=1
--- a/dashboards/openstack-ansible.dash
+++ b/dashboards/openstack-ansible.dash
@ -6,7 +6,7 @@ foreach = (project:^openstack/openstack-ansible.* OR
           status:open
           NOT owner:self
           NOT label:Workflow<=-1
-           label:Verified>=1,jenkins
+           label:Verified>=1,zuul
           NOT reviewedby:self

 # core reviewers taken from https://review.openstack.org/#/admin/groups/490,members
@ -34,7 +34,7 @@ query = reviewer:self NOT reviewedby:self
 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50 NOT label:Code-Review<=-1 NOT reviewedby:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/openstackclient.dash
+++ b/dashboards/openstackclient.dash
@ -2,7 +2,7 @@
 title = OpenStack Client Review Inbox
 description = Review Inbox
 foreach = (project:openstack/python-openstackclient OR project:openstack/cliff) status:open
-    NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins
+    NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul
    NOT reviewedby:self branch:master

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
@ -14,10 +14,10 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = NOT label:Code-Review<=-2 label:Code-Review>=2

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1 message:"bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1 NOT message:"bug: "

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/os-api-ref.dash
+++ b/dashboards/os-api-ref.dash
@ -1,15 +1,15 @@
 [dashboard]
 title = OS-API-Ref Review Inbox
 description = Review Inbox
-foreach = project:openstack/os-api-ref status:open label:Verified>=1,jenkins NOT reviewedby:self
+foreach = project:openstack/os-api-ref status:open label:Verified>=1,zuul NOT reviewedby:self

 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50 NOT label:Code-Review<=-1,self

-[section "Passed Jenkins, No Negative Feedback (Small Fixes)"]
+[section "Passed Zuul, No Negative Feedback (Small Fixes)"]
 query = NOT label:Code-Review<=-1 delta:<=10

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review<=-1 delta:>10

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
--- a/dashboards/oslo.dash
+++ b/dashboards/oslo.dash
@ -41,7 +41,7 @@ query = label:Code-Review>=2 limit:50
 [section "New Contributors"]
 query = reviewer:10068

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/patrole.dash
+++ b/dashboards/patrole.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Patrole Review Inbox
 description = Review Inbox
-foreach = project:openstack/patrole status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self
+foreach = project:openstack/patrole status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self

 [section "Needs final +2"]
 query = NOT label:Code-Review<=-1,patrole-core label:Code-Review>=2 NOT label:workflow>=1
@ -15,10 +15,10 @@ query = NOT label:Code-Review<=2 age:5d
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = reviewer:self

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1,patrole-core message:"Closes-Bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1,patrole-core NOT message:"Closes-Bug: "

 [section "Wayward Changes (Changes with no code review in the last 5 days)"]
--- a/dashboards/puppet-openstack.dash
+++ b/dashboards/puppet-openstack.dash
@ -6,25 +6,25 @@ foreach = (project:openstack/puppet-ceph OR
           project:^openstack/puppet-.*) status:open NOT label:Workflow<=-1

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1)

 [section "Puppet OpenStack Specs"]
 query = NOT owner:self project:openstack/puppet-openstack-specs NOT label:Code-Review<=-2

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review<=-1
+query = label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review<=-1

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins NOT label:Code-Review<=-1 NOT label:Workflow<=-1
+query = label:Verified<=-1,zuul NOT label:Code-Review<=-1 NOT label:Workflow<=-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=2 age:5d
+query = label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=2 age:5d

 [section "Disagreement"]
-query = label:Verified>=1,jenkins label:Code-Review<=-1 label:Code-Review>=1
+query = label:Verified>=1,zuul label:Code-Review<=-1 label:Code-Review>=1

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = label:Verified>=1,zuul NOT owner:self NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "Other"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/puppet-openstack-specs label:Code-Review-1 NOT label:Code-Review>=1 limit:20
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/puppet-openstack-specs label:Code-Review-1 NOT label:Code-Review>=1 limit:20
--- a/dashboards/qa-program.dash
+++ b/dashboards/qa-program.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = QA Review Inbox
 description = Review Inbox
-foreach = (project:openstack/tempest OR project:openstack/tempest-lib OR project:openstack/qa-specs) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self
+foreach = (project:openstack/tempest OR project:openstack/tempest-lib OR project:openstack/qa-specs) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self

 [section "QA Specs"]
 query = project:openstack/qa-specs
@ -18,10 +18,10 @@ query = NOT label:Code-Review<=2 age:5d
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1,tempest-core message:"Closes-Bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1,tempest-core NOT message:"Closes-Bug: "

 [section "Wayward Changes (Changes with no code review in the last 5 days)"]
--- a/dashboards/rally.dash
+++ b/dashboards/rally.dash
@ -7,7 +7,7 @@ foreach = (project:openstack/rally) status:open
 query = (starredby:"rvasilets@mirantis.com" AND starredby:"boris@pavlovic.me")

 [section "Waiting for final approve"]
-query = label:Verified>=1,jenkins label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT owner:self label:Code-Review>=2
+query = label:Verified>=1,zuul label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT owner:self label:Code-Review>=2

 [section "Bug fixes"]
 query = topic:"^bug/.*"
@ -16,7 +16,7 @@ query = topic:"^bug/.*"
 query = (message:"[spec]" file:"^.*specs.*")

 [section "Ready for review"]
-query = label:Verified>=1,jenkins NOT label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT label:Code-Review>=2 NOT (message:"[spec]" file:"^.*specs.*")
+query = label:Verified>=1,zuul NOT label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT label:Code-Review>=2 NOT (message:"[spec]" file:"^.*specs.*")

 [section "Has -1 but passed tests"]
-query = label:Verified>=1,jenkins label:Verified>=1,rally-ci label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT (message:"[spec]" file:"^.*specs.*")
+query = label:Verified>=1,zuul label:Verified>=1,rally-ci label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT (message:"[spec]" file:"^.*specs.*")
--- a/dashboards/releases.dash
+++ b/dashboards/releases.dash
@ -25,7 +25,7 @@ query = is:open project:openstack/releases
 query = project:openstack-infra/release-tools

 [section "project-config release-tools"]
-query = project:openstack-infra/project-config file:^jenkins/scripts/release-tools/.*
+query = project:openstack-infra/project-config file:^zuul/scripts/release-tools/.*

 [section "reno"]
 query = project:openstack/reno
--- a/dashboards/requirements.dash
+++ b/dashboards/requirements.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Global Requirements Review Inbox
 description = Review Inbox
-foreach = project:openstack/requirements status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = project:openstack/requirements status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "New Releases"]
 query = topic:new-release
@ -15,7 +15,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50 NOT reviewedby:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50 branch:master

 [section "Wayward Changes (Changes with no code review in the last 2 days)"]
--- a/dashboards/sahara.dash
+++ b/dashboards/sahara.dash
@ -4,28 +4,28 @@ description = Sahara Review Inbox
 foreach = (project:^openstack/.*sahara.*) status:open NOT label:Workflow<=-1 NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Verified-1,savanna-ci OR label:Code-Review-1 OR label:Workflow<=-1)
+query = owner:self (label:Verified-1,zuul OR label:Verified-1,savanna-ci OR label:Code-Review-1 OR label:Workflow<=-1)

 [section "Sahara Specs"]
 query = NOT owner:self project:openstack/sahara-specs

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins label:Verified>=1,savanna-ci NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1
+query = label:Verified>=1,zuul label:Verified>=1,savanna-ci NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 NOT label:Workflow>=1 NOT label:Workflow<=-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins label:Verified>=1,savanna-ci NOT owner:self NOT project:openstack/sahara-specs NOT label:Code-Review<=2 NOT label:Workflow<=-1 age:5d
+query = label:Verified>=1,zuul label:Verified>=1,savanna-ci NOT owner:self NOT project:openstack/sahara-specs NOT label:Code-Review<=2 NOT label:Workflow<=-1 age:5d

 [section "New Contributors"]
 query = reviewer:"Welcome, new contributor!"

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins label:Verified>=1,savanna-ci NOT owner:self NOT project:openstack/sahara-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 NOT label:Workflow<=-1 limit:20
+query = label:Verified>=1,zuul label:Verified>=1,savanna-ci NOT owner:self NOT project:openstack/sahara-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 NOT label:Workflow<=-1 limit:20

 [section "Other"]
-query = label:Verified>=1,jenkins label:Verified>=1,savanna-ci NOT owner:self NOT project:openstack/sahara-specs label:Code-Review-1 limit:20
+query = label:Verified>=1,zuul label:Verified>=1,savanna-ci NOT owner:self NOT project:openstack/sahara-specs label:Code-Review-1 limit:20

 [section "Needs Reverify"]
-query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,jenkins
+query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,zuul

 [section "Work In Progress Or Unverified"]
-query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,jenkins OR label:Verified<=-1,savanna-ci) limit:20
+query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,zuul OR label:Verified<=-1,savanna-ci) limit:20
--- a/dashboards/stable.dash
+++ b/dashboards/stable.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = stable-maint Review Inbox
 description = Review Inbox
-foreach = (project:openstack/ceilometer OR project:openstack/python-ceilometerclient OR project:openstack/cinder OR project:openstack/python-cinderclient OR project:openstack/glance OR project:openstack/python-glanceclient OR project:openstack/heat OR project:openstack/python-heatclient OR project:openstack/horizon OR project:openstack/keystone OR project:openstack/python-keystoneclient OR project:openstack/neutron OR project:openstack/python-neutronclient OR project:openstack/nova OR project:openstack/python-novaclient OR project:openstack/trove OR project:openstack/python-troveclient) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self branch:^stable/.*
+foreach = (project:openstack/ceilometer OR project:openstack/python-ceilometerclient OR project:openstack/cinder OR project:openstack/python-cinderclient OR project:openstack/glance OR project:openstack/python-glanceclient OR project:openstack/heat OR project:openstack/python-heatclient OR project:openstack/horizon OR project:openstack/keystone OR project:openstack/python-keystoneclient OR project:openstack/neutron OR project:openstack/python-neutronclient OR project:openstack/nova OR project:openstack/python-novaclient OR project:openstack/trove OR project:openstack/python-troveclient) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self branch:^stable/.*

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -12,7 +12,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:stable-maint-core label:Code-Review<=-1) limit:50

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:stable-maint-core label:Code-Review<=-1) limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/starred.dash
+++ b/dashboards/starred.dash
@ -13,7 +13,7 @@ query = message:"Blueprint"
 [section "Specs"]
 query = project:^.*-specs

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Needs final +2"]
--- a/dashboards/swift-project.dash
+++ b/dashboards/swift-project.dash
@ -13,7 +13,7 @@ query = NOT label:Workflow>=1 NOT label:Workflow<=-1 NOT owner:self label:Code-R
 query = label:Workflow>=1 NOT label:Code-Review<=-2

 [section "Needs Reverify"]
-query = label:Verified<=-1,jenkins NOT project:openstack/swift-specs branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1 NOT label:Code-Review<=-2
+query = label:Verified<=-1,zuul NOT project:openstack/swift-specs branch:master NOT label:Code-Review<=-1 NOT label:Workflow<=-1 NOT label:Code-Review<=-2

 [section "Possible abandoned changes"]
-query = status:open age:4week (label:Verified<=-1,jenkins OR label:Code-Review<=-1) NOT label:Workflow<=-1
+query = status:open age:4week (label:Verified<=-1,zuul OR label:Code-Review<=-1) NOT label:Workflow<=-1
--- a/dashboards/swift.dash
+++ b/dashboards/swift.dash
@ -19,7 +19,7 @@ query = NOT project:openstack/swift-specs branch:^stable/.* status:open
 query = NOT project:openstack/swift-specs branch:^feature/.* status:open

 [section "Recently Proposed to master"]
-query = NOT label:Workflow>=1 (NOT label:Code-Review-1,swift-core OR (label:Code-Review-1,swiftclient-core AND project:openstack/python-swiftclient)) label:Verified>=1,jenkins NOT label:Code-Review>=2 NOT project:openstack/swift-specs -age:1week branch:master
+query = NOT label:Workflow>=1 (NOT label:Code-Review-1,swift-core OR (label:Code-Review-1,swiftclient-core AND project:openstack/python-swiftclient)) label:Verified>=1,zuul NOT label:Code-Review>=2 NOT project:openstack/swift-specs -age:1week branch:master

 [section "Older open patches"]
 query = NOT label:Workflow>=1 NOT label:Code-Review<=2 age:1week NOT project:openstack/swift-specs (NOT label:Code-Review-1,swift-core OR (label:Code-Review-1,swiftclient-core AND project:openstack/python-swiftclient))
--- a/dashboards/tacker.dash
+++ b/dashboards/tacker.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Tacker Review Inbox
 description = Review Inbox
-foreach = (project:^.*/.*tacker.*) NOT label:Workflow<=-1 NOT label:Code-Review<=-2 status:open NOT owner:self label:Verified>=1,jenkins NOT label:Code-Review>=0,self
+foreach = (project:^.*/.*tacker.*) NOT label:Workflow<=-1 NOT label:Code-Review<=-2 status:open NOT owner:self label:Verified>=1,zuul NOT label:Code-Review>=0,self

 [section "Proposal Bot Proposals"]
 query = owner:"OpenStack Proposal Bot <openstack-infra@lists.openstack.org>"
@ -15,7 +15,7 @@ query = NOT label:Code-Review<=2 NOT label:Verified<=-1 NOT owner:self age:5d
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=2,self reviewer:self NOT owner:self limit:10

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = label:Code-Review>=1 NOT label:Code-Review<=-1 AND NOT label:Verified<=-1 NOT owner:self NOT reviewer:self limit:10

 [section "Negative Feedback"]
--- a/dashboards/tap-as-a-service.dash
+++ b/dashboards/tap-as-a-service.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = tap-as-a-service Review Inbox
 description = Review Inbox
-foreach = (project:openstack/tap-as-a-service OR project:openstack/tap-as-a-service-dashboard) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack/tap-as-a-service OR project:openstack/tap-as-a-service-dashboard) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d branch:master
@ -12,7 +12,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = label:Code-Review>=2 NOT(reviewerin:tap-as-a-service-core label:Code-Review<=-1) limit:50 branch:master

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review>=2 NOT(reviewerin:tap-as-a-service-core label:Code-Review<=-1) limit:50 branch:master

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/telemetry.dash
+++ b/dashboards/telemetry.dash
@ -4,28 +4,28 @@ description = Telemetry Review Inbox
 foreach = (project:openstack/ceilometer OR project:openstack/python-ceilometerclient OR project:openstack/ceilometermiddleware OR project:openstack/ceilometer-specs OR project:openstack/aodh OR project:openstack/python-aodhclient OR project:openstack/gnocchi OR project:openstack/python-gnocchiclient OR project:openstack/panko) status:open NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1 OR label:Workflow<=-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1 OR label:Workflow<=-1)

 [section "Telemetry Specs"]
 query = NOT label:Workflow>=1 NOT owner:self project:openstack/ceilometer-specs

 [section "Needs Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "Needs Reverify"]
-query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,jenkins
+query = label:Workflow>=1 NOT label:Workflow<=-1 label:Verified<=-1,zuul

 [section "5 Days Without Feedback"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT project:openstack/ceilometer-specs NOT label:Code-Review<=2 age:5d
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT project:openstack/ceilometer-specs NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback (top 50)"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self NOT project:openstack/ceilometer-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self NOT project:openstack/ceilometer-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "With Negative Feedback (top 20)"]
-query = NOT label:Workflow<=-1 NOT label:Verified<=-1,jenkins NOT owner:self NOT project:openstack/ceilometer-specs label:Code-Review-1 limit:20
+query = NOT label:Workflow<=-1 NOT label:Verified<=-1,zuul NOT owner:self NOT project:openstack/ceilometer-specs label:Code-Review-1 limit:20

 [section "Unreviewed, not WIP (top 20)"]
 query = NOT label:Code-Review<=2 NOT label:Workflow<=-1 NOT project:openstack/ceilometer-specs limit:20

 [section "Work In Progress Or Unverified (top 20)"]
-query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,jenkins) limit:20
+query = NOT label:Workflow>=1 NOT owner:self (label:Workflow<=-1 OR label:Verified<=-1,zuul) limit:20
--- a/dashboards/tempest.dash
+++ b/dashboards/tempest.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Tempest Review Inbox
 description = Review Inbox
-foreach = (project:openstack/tempest OR project:openstack/tempest-lib OR project:openstack/qa-specs) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self
+foreach = (project:openstack/tempest OR project:openstack/tempest-lib OR project:openstack/qa-specs) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self

 [section "QA Specs"]
 query = project:openstack/qa-specs
@ -15,7 +15,7 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = (project:openstack/tempest OR project:openstack-dev/grenade) label:Code-Review>=2 limit:50 NOT label:Code-Review<=-1

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/tooz_taskflow.dash
+++ b/dashboards/tooz_taskflow.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Tooz and TaskFlow Review Inbox
 description = Review Inbox
-foreach = (project:openstack/taskflow OR project:openstack/tooz) status:open NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review>=-2
+foreach = (project:openstack/taskflow OR project:openstack/tooz) status:open NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review>=-2

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -12,10 +12,10 @@ query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:se
 [section "Needs final +2"]
 query = NOT label:Code-Review<=-2 label:Code-Review>=2

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1 message:"bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1 NOT message:"bug: "

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/dashboards/tripleo-quickstart.dash
+++ b/dashboards/tripleo-quickstart.dash
@ -5,20 +5,20 @@ foreach = (project:openstack/tripleo-quickstart OR
    project:openstack/tripleo-quickstart-extras) status:open NOT label:Workflow<=-1 NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1)

 [section "TripleO Specs"]
 query = NOT owner:self project:openstack/tripleo-specs

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=2 age:5d
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "Other"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs label:Code-Review-1 limit:20
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs label:Code-Review-1 limit:20

--- a/dashboards/tripleo-stable.dash
+++ b/dashboards/tripleo-stable.dash
@ -10,20 +10,20 @@ foreach = (project:openstack/tripleo-heat-templates OR
           project:openstack/tripleo-docs) status:open NOT label:Workflow<=-1 NOT label:Code-Review<=-2,self branch:^stable/.*

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1)

 [section "TripleO Specs"]
 query = NOT owner:self project:openstack/tripleo-specs

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=2 age:5d
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "Other"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs label:Code-Review-1 limit:20
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs label:Code-Review-1 limit:20

--- a/dashboards/tripleo.dash
+++ b/dashboards/tripleo.dash
@ -24,20 +24,20 @@ foreach = (project:openstack/dib-utils OR
           project:openstack-infra/tripleo-ci) status:open NOT label:Workflow<=-1 NOT label:Code-Review<=-2

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified-1,jenkins OR label:Code-Review-1)
+query = owner:self (label:Verified-1,zuul OR label:Code-Review-1)

 [section "TripleO Specs"]
 query = NOT owner:self project:openstack/tripleo-specs

 [section "Needs Approval"]
-query = label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1
+query = label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1

 [section "5 Days Without Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=2 age:5d
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=2 age:5d

 [section "No Negative Feedback"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs NOT label:Code-Review<=-1 NOT label:Code-Review>=2 limit:50

 [section "Other"]
-query = label:Verified>=1,jenkins NOT owner:self NOT project:openstack/tripleo-specs label:Code-Review-1 limit:20
+query = label:Verified>=1,zuul NOT owner:self NOT project:openstack/tripleo-specs label:Code-Review-1 limit:20

--- a/dashboards/trove.dash
+++ b/dashboards/trove.dash
@ -5,31 +5,31 @@ description = Review Dashboard for the OpenStack DBaaS Project (Trove)
 foreach = status:open  (project:openstack/trove OR project:openstack/trove-integration OR project:openstack/trove-specs OR project:openstack/python-troveclient OR project:openstack/trove-dashboard)

 [section "My Patches Requiring Attention"]
-query = owner:self (label:Verified<=-1,jenkins OR label:Code-Review<=-1 OR label:Workflow<=-1 OR NOT is:mergeable) (project:openstack/trove OR project:openstack/trove-integration OR project:openstack/trove-specs OR project:openstack/python-troveclient OR project:openstack/trove-dashboard)
+query = owner:self (label:Verified<=-1,zuul OR label:Code-Review<=-1 OR label:Workflow<=-1 OR NOT is:mergeable) (project:openstack/trove OR project:openstack/trove-integration OR project:openstack/trove-specs OR project:openstack/python-troveclient OR project:openstack/trove-dashboard)

 [section "Patches waiting longer than 14 days"]
-query = label:Verified>=1,jenkins NOT label:Workflow<=-1 NOT label:Code-Review<=-1 is:mergeable age:14d
+query = label:Verified>=1,zuul NOT label:Workflow<=-1 NOT label:Code-Review<=-1 is:mergeable age:14d

 [section "Patches waiting longer than 7 days"]
-query = label:Verified>=1,jenkins NOT label:Workflow<=-1 NOT label:Code-Review<=-1 is:mergeable age:7d NOT age:14d
+query = label:Verified>=1,zuul NOT label:Workflow<=-1 NOT label:Code-Review<=-1 is:mergeable age:7d NOT age:14d

 [section "Specs requiring review"]
-query = project:openstack/trove-specs NOT label:Workflow<=-1  NOT label:Verified<=-1,jenkins NOT label:Code-Review<=-2
+query = project:openstack/trove-specs NOT label:Workflow<=-1  NOT label:Verified<=-1,zuul NOT label:Code-Review<=-2

 [section "Trove: Priority code reviews"]
-query = (starredby:amrith OR starredby:self) (project:openstack/trove OR project:openstack/trove-integration) NOT label:Workflow<=-1 is:mergeable NOT label:Verified<=-1,jenkins NOT label:Code-Review<=-2
+query = (starredby:amrith OR starredby:self) (project:openstack/trove OR project:openstack/trove-integration) NOT label:Workflow<=-1 is:mergeable NOT label:Verified<=-1,zuul NOT label:Code-Review<=-2

 [section "Trove Client and Dashboard: Priority code reviews"]
-query = (starredby:amrith OR starredby:self) (project:openstack/python-troveclient OR project:openstack/trove-dashboard) NOT label:Workflow<=-1 is:mergeable  NOT label:Verified<=-1,jenkins NOT label:Code-Review<=-2
+query = (starredby:amrith OR starredby:self) (project:openstack/python-troveclient OR project:openstack/trove-dashboard) NOT label:Workflow<=-1 is:mergeable  NOT label:Verified<=-1,zuul NOT label:Code-Review<=-2

 [section "Changes needing Final Approval"]
-query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 is:mergeable
+query = NOT label:Workflow>=1 NOT label:Workflow<=-1 label:Verified>=1,zuul NOT owner:self label:Code-Review>=2 NOT label:Code-Review-1 is:mergeable

 [section "Changes on branches other than master"]
 query = NOT branch:master

 [section "Needing attention"]
-query = (((label:Verified<=-1,jenkins) NOT label:Workflow<=-1 NOT label:Code-Review<=-2) OR NOT is:mergeable)
+query = (((label:Verified<=-1,zuul) NOT label:Workflow<=-1 NOT label:Code-Review<=-2) OR NOT is:mergeable)



--- a/dashboards/watched.dash
+++ b/dashboards/watched.dash
@ -6,7 +6,7 @@ foreach = is:watched is:open
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Needs final +2"]
--- a/dashboards/watcher.dash
+++ b/dashboards/watcher.dash
@ -5,7 +5,7 @@ foreach = (project:openstack/watcher OR
           project:openstack/python-watcherclient OR
           project:openstack/watcher-specs
           project:openstack/watcher-dashboard)
-           status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self
+           status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self

 [section "Needs final +2"]
 query = NOT label:Code-Review<=-1 label:Code-Review>=2 NOT label:workflow>=1
@ -19,10 +19,10 @@ query = NOT label:Code-Review<=2 age:5d
 [section "You are a reviewer, but haven't voted in the current revision"]
 query = NOT label:Code-Review<=-1,self NOT label:Code-Review>=1,self reviewer:self

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1  message:"Closes-Bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1  NOT message:"Closes-Bug: "

 [section "Wayward Changes (Changes with no code review in the last 5 days)"]
--- a/personal/harlowja-misc.dash
+++ b/personal/harlowja-misc.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Josh's Misc Review Inbox
 description = Review Inbox
-foreach = (project:openstack/taskflow OR project:openstack/tooz OR project:openstack/anvil OR project:openstack/doc8 OR project:openstack/cloud-init OR project:openstack/debtcollector) status:open NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT label:Code-Review>=-2
+foreach = (project:openstack/taskflow OR project:openstack/tooz OR project:openstack/anvil OR project:openstack/doc8 OR project:openstack/cloud-init OR project:openstack/debtcollector) status:open NOT label:Workflow<=-1 label:Verified>=1,zuul NOT label:Code-Review>=-2

 [section "Needs Feedback (Changes older than 5 days that have not been reviewed by anyone)"]
 query = NOT label:Code-Review<=2 age:5d
@ -12,10 +12,10 @@ query = reviewer:self
 [section "Needs final +2"]
 query = NOT label:Code-Review<=-2 label:Code-Review>=2

-[section "Bug fix, Passed Jenkins, No Negative Core Feedback"]
+[section "Bug fix, Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1 message:"bug: "

-[section "Passed Jenkins, No Negative Core Feedback"]
+[section "Passed Zuul, No Negative Core Feedback"]
 query = NOT label:Code-Review<=-1 NOT message:"bug: "

 [section "Wayward Changes (Changes with no code review in the last 2days)"]
--- a/personal/seans-misc.dash
+++ b/personal/seans-misc.dash
@ -1,7 +1,7 @@
 [dashboard]
 title = Sean's Misc Review Inbox
 description = Review Inbox
-foreach = (project:openstack-infra/elastic-recheck OR project:openstack-infra/os-loganalyze OR project:openstack-dev/hacking OR project:openstack/requirements OR project:openstack/governance OR project:openstack-infra/reviewstats OR project:openstack-infra/gitdm OR project:openstack/gerrit-dash-creator) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,jenkins NOT reviewedby:self
+foreach = (project:openstack-infra/elastic-recheck OR project:openstack-infra/os-loganalyze OR project:openstack-dev/hacking OR project:openstack/requirements OR project:openstack/governance OR project:openstack-infra/reviewstats OR project:openstack-infra/gitdm OR project:openstack/gerrit-dash-creator) status:open NOT owner:self NOT label:Workflow<=-1 label:Verified>=1,zuul NOT reviewedby:self

 [section "ER Queries"]
 query = project:openstack-infra/elastic-recheck file:^queries/.*yaml
@ -21,7 +21,7 @@ query = reviewer:self
 [section "Needs final +2"]
 query = label:Code-Review>=2 limit:50

-[section "Passed Jenkins, No Negative Feedback"]
+[section "Passed Zuul, No Negative Feedback"]
 query = NOT label:Code-Review>=2 NOT label:Code-Review<=-1 limit:50

 [section "Wayward Changes (Changes with no code review in the last 2 days)"]