From cd75df6ce06b12c01af0eeb9578d2ca80af4f0cf Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 13 Oct 2025 15:17:27 +0100 Subject: Drop support for building MariaDB clustercheck MariaDB clustercheck script has not been maintained and it will not work with MariaDB 11.4 (the next LTS version). This is because clustercheck.sh uses ``mysql*`` commands but from MariaDB 11.4, those commands are not supported. The health check of MariaDB server containers will be done by new script which comes with change [1]. Without MariaDB clustercheck, MariaDB server becomes only container image in the family, so mariadb-base and mariadb-server dockerfiles are merged. To avoid breaking changes, the name 'mariadb-server' is retained. Follow-up to rename references in Kolla and K-A from 'mariadb-server' to 'mariadb' would be nice. [1] https://review.opendev.org/c/openstack/kolla/+/962657 Change-Id: I01278f76ee82b018a854b5862f3caaa8c78a9a30 Signed-off-by: Seunghun Lee --- zuul.d/scenarios/cephadm.yaml | 8 ++++---- zuul.d/scenarios/mariadb.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'zuul.d') diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index 1a56c81ff..93578439a 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -6,10 +6,10 @@ check: jobs: - kolla-ansible-debian-bookworm-cephadm: - files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.* - kolla-ansible-debian-bookworm-cephadm-upgrade: - files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.* - kolla-ansible-ubuntu-noble-cephadm: - files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.* - kolla-ansible-ubuntu-noble-cephadm-upgrade: - files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.* diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml index 42b4535df..3627e11a4 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -6,6 +6,6 @@ check: jobs: - kolla-ansible-debian-bookworm-mariadb: - files: ^docker/(base|mariadb)/ + files: ^docker/(base|mariadb-server)/ - kolla-ansible-ubuntu-noble-mariadb: - files: ^docker/(base|mariadb)/ + files: ^docker/(base|mariadb-server)/ -- cgit v1.2.3