From f81fb0bb7d94dd442179cbcb1df907e7a681ce9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branislav=20N=C3=A1ter?= Date: Wed, 17 Feb 2021 15:22:31 +0100 Subject: [PATCH] Fix library name differences --- Sanity/httpd-php-mysql-sanity-test/runtest.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Sanity/httpd-php-mysql-sanity-test/runtest.sh b/Sanity/httpd-php-mysql-sanity-test/runtest.sh index c7ad26d..913bd6a 100755 --- a/Sanity/httpd-php-mysql-sanity-test/runtest.sh +++ b/Sanity/httpd-php-mysql-sanity-test/runtest.sh @@ -49,7 +49,11 @@ rlJournalStart SERVICE=${mysqlServiceName} else DB="mariadb-server" - rlRun "rlImport mariadb55/basic" 0 "Import mariadb library" + # upstream beaker library on GitHub has different name + if ! rlIsFedora; then + rlRun "rlImport mariadb55/basic" 0 "Import mariadb library" + else + rlRun "rlImport database/mariadb" 0 "Import mariadb library" SERVICE=${mariadbServiceName} fi # install also php-mysql on rhel-6 (instead of php-mysqlnd on rhel-7)