From 68ef16134d5f8fcef3df25ebc4c890e86ca57d80 Mon Sep 17 00:00:00 2001 From: Miguel Lavalle Date: Fri, 31 Dec 2021 16:14:23 -0600 Subject: [PATCH] Fix mysqladmin failure for Fedora 34 and mariadb mysqladmin is incorrectly installed in Fedora 34 with mariadb. This causes the failure of Zuul Fedora based jobs. The issue is a conflict between mariadb and community mysql that is described in [1] and [2]. The workaround is to explicitly install package "mariadb" Also configure an increased swap size like for the other platform jobs in order to avoid OOM issues. [1] https://bugzilla.redhat.com/show_bug.cgi?id=2026933 [2] https://lists.launchpad.net/maria-discuss/msg06179.html Closes-Bug: #1956116 Change-Id: Icf6d7e1af5130689ea10b29d37cc9b188b2c9754 (cherry picked from commit c1a75c6a504d720e9d46f924f5c3da07fddfee72) --- .zuul.yaml | 3 +++ lib/databases/mysql | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 24940b36c7..6617cbc993 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -633,6 +633,8 @@ description: Fedora latest platform test nodeset: devstack-single-node-fedora-latest voting: false + vars: + configure_swap_size: 4096 - job: name: devstack-platform-fedora-latest-virt-preview @@ -641,6 +643,7 @@ nodeset: devstack-single-node-fedora-latest voting: false vars: + configure_swap_size: 4096 devstack_localrc: ENABLE_FEDORA_VIRT_PREVIEW_REPO: true diff --git a/lib/databases/mysql b/lib/databases/mysql index d4969d713c..ef5b90171e 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -176,7 +176,7 @@ EOF if is_oraclelinux; then install_package mysql-community-server elif is_fedora; then - install_package mariadb-server mariadb-devel + install_package mariadb-server mariadb-devel mariadb sudo systemctl enable $MYSQL_SERVICE_NAME elif is_suse; then install_package mariadb-server