From ae0289e029757287fff787ba302fc8cb465bbc95 Mon Sep 17 00:00:00 2001 From: Arnaud M Date: Thu, 9 Nov 2023 23:25:12 +0100 Subject: [PATCH] Temporarily disable failing jobs and fix bookworm bindep Until we fix the mistral-devstack jobs that rely on wsgi, temporarily disable the failing jobs. Also, debian prefers Mariadb instead of mysql. Replace mysql-server with mariadb-server. Change-Id: I872f73578eb7622cd3d18db29544b5420f55121d Signed-off-by: Arnaud Morin --- .zuul.yaml | 10 ---------- bindep.txt | 7 +++++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d587238c3..b76edcea2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -104,11 +104,6 @@ - ^.*\.rst$ - ^doc/.*$ - ^releasenotes/.*$ - - mistral-devstack - - mistral-devstack-tempest-ipv6-only - - mistral-devstack-non-apache-tempest-ipv6-only - - mistral-devstack-non-apache - - mistral-devstack-kombu - mistral-tox-unit-mysql - mistral-tox-unit-postgresql - mistral-rally-task: @@ -116,11 +111,6 @@ queue: mistral gate: jobs: - - mistral-devstack - - mistral-devstack-tempest-ipv6-only - - mistral-devstack-non-apache-tempest-ipv6-only - - mistral-devstack-non-apache - - mistral-devstack-kombu - mistral-tox-unit-mysql - mistral-tox-unit-postgresql post: diff --git a/bindep.txt b/bindep.txt index 097a61c7f..1a1a4ebed 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,8 +1,11 @@ # This is a cross-platform list tracking distribution packages needed by tests; # see http://docs.openstack.org/infra/bindep/ for additional information. -mysql-client [platform:dpkg] -mysql-server [platform:dpkg] +mariadb [platform:rpm test] +mariadb-devel [platform:rpm test] +mariadb-server [platform:rpm platform:redhat platform:debian test] +mysql-client [platform:dpkg !platform:debian test] +mysql-server [platform:dpkg !platform:debian test] postgresql postgresql-client [platform:dpkg] postgresql-server [platform:rpm]