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
diff --git a/lib/databases/mysql b/lib/databases/mysql
index d0fa119..8edbf8c 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -178,7 +178,7 @@
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