From 5a17149def309cdb8c63111351765e2ce5f0692a Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Wed, 16 Aug 2023 23:19:58 -0400 Subject: [PATCH] Use openstack-tox-py311 job Instead of our custom tox-py311 job, use the openstack-wide job that was added by change I725b94bee6601a and added to the testing template by I3b22ff95ab7b83a. Since the openstack-tox-py311 job uses a debian bookworm nodeset, follow change I736ecb2a18d3 in adjusting cinder's bindep.txt. Change-Id: I3b22ff95ab7b83ae6e0e12f0d2bf645cc87424d2 --- .zuul.yaml | 11 ----------- bindep.txt | 9 +++++---- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 80f7e4dd2ca..26ab965097a 100644 --- a/.zuul.yaml +++ b/.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' diff --git a/bindep.txt b/bindep.txt index 6311a188539..467b9ab1f0c 100644 --- a/bindep.txt +++ b/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]