Merge "Use openstack-tox-py311 job"

.zuul.yaml

@@ -86,8 +86,6 @@
             irrelevant-files: *gate-irrelevant-files
         - openstacksdk-functional-devstack:
             irrelevant-files: *gate-irrelevant-files
-        - cinder-tox-py311:
-            voting: false
     gate:
       jobs:
         - cinder-grenade-mn-sub-volbak:
@@ -364,12 +362,3 @@
           $TEMPEST_CONFIG:
             volume:
               build_timeout: 900
-
-- job:
-    # copied from cinderlib
-    name: cinder-tox-py311
-    parent: openstack-tox
-    nodeset: ubuntu-jammy
-    vars:
-        tox_envlist: py311
-        python_version: '3.11'

bindep.txt

@@ -19,12 +19,13 @@ openssl-devel [platform:rpm !platform:suse]
 libopenssl-devel [platform:suse !platform:rpm]
 locales [platform:debian]
 mariadb [platform:rpm]
-mariadb-server [platform:redhat]
+mariadb-server [platform:redhat platform:debian]
 mariadb-devel [platform:redhat]
-libmysqlclient-dev [platform:dpkg]
+libmariadb-dev-compat [platform:debian]
+libmysqlclient-dev [platform:ubuntu]
 libmysqlclient-devel [platform:suse]
-mysql-client [platform:dpkg]
-mysql-server [platform:dpkg]
+mysql-client [platform:dpkg !platform:debian]
+mysql-server [platform:dpkg !platform:debian]
 postgresql
 postgresql-client [platform:dpkg]
 postgresql-devel [platform:rpm]