Merge "Simplify queue names"

zuul.d/projects.yaml

@@ -24603,7 +24603,7 @@
       jobs:
         - openstack-tox-cover
     gate:
-      queue: python-saharaclient
+      queue: sahara
       jobs:
         - legacy-sahara-dsvm-scenario-neutron
         - legacy-tempest-dsvm-neutron-src-python-saharaclient:
@@ -25546,7 +25546,7 @@
       jobs:
         - legacy-trove-functional-dsvm-mysql
     gate:
-      queue: python-troveclient
+      queue: trove
       jobs:
         - legacy-trove-functional-dsvm-mysql
 
@@ -26325,7 +26325,7 @@
               - ^doc/.*$
               - ^releasenotes/.*$
     gate:
-      queue: python-saharaclient
+      queue: sahara
       jobs:
         - legacy-sahara-dsvm-scenario-neutron:
             irrelevant-files:
@@ -26481,7 +26481,7 @@
         - openstack-tox-cover:
             voting: false
     gate:
-      queue: python-saharaclient
+      queue: sahara
       jobs:
         - legacy-sahara-dsvm-scenario-neutron:
             irrelevant-files:
@@ -34042,7 +34042,7 @@
         - legacy-trove-tox-apiexamples
         - openstack-tox-pylint
     gate:
-      queue: python-troveclient
+      queue: trove
       jobs:
         - legacy-trove-functional-dsvm-mysql
         - legacy-trove-scenario-dsvm-mysql-single