From 082ae16d2f6c94ba204d9f1f6d773c921045dee1 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Jul 29 2019 16:16:02 +0000
Subject: Added c8 for mysql/mariadb tests


Signed-off-by: Fabian Arrotin <arrfab@centos.org>

---

diff --git a/tests/p_mysql/0-install_mysqld.sh b/tests/p_mysql/0-install_mysqld.sh
index f055837..1a5d1ba 100755
--- a/tests/p_mysql/0-install_mysqld.sh
+++ b/tests/p_mysql/0-install_mysqld.sh
@@ -7,7 +7,7 @@ t_Log "Running $0 - installing and starting mysql server."
 # MySQL
 # starting with 5.10, we have to add mysql55
 
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" -ge 7 ] ; then
   my_packages="mariadb mariadb-server nc"
   mysql_service="mariadb"
 elif [ "$centos_ver" = "5" ] ;then
diff --git a/tests/p_mysql/15_mysqld_create_db.sh b/tests/p_mysql/15_mysqld_create_db.sh
index 9697590..af32bda 100755
--- a/tests/p_mysql/15_mysqld_create_db.sh
+++ b/tests/p_mysql/15_mysqld_create_db.sh
@@ -3,12 +3,5 @@
 
 t_Log "Running $0 - MySQL create database test"
 
-if [ $centos_ver -gt 6 ]
-then
-  t_Log 'mysql is only supported on C5 and C6, skipping'
-  t_CheckExitStatus 0       
-  exit 0
-fi
-
 mysql -u root -e 'create database mysql_test' >/dev/null 2>&1
 t_CheckExitStatus $?
diff --git a/tests/p_mysql/20_mysqld_drop_db.sh b/tests/p_mysql/20_mysqld_drop_db.sh
index d2ded67..a1cea19 100755
--- a/tests/p_mysql/20_mysqld_drop_db.sh
+++ b/tests/p_mysql/20_mysqld_drop_db.sh
@@ -3,12 +3,5 @@
 
 t_Log "Running $0 - MySQL drop database test."
 
-if [ $centos_ver -gt 6 ]
-then
-  t_Log 'mysql is only supported on C5 and C6, skipping'
-  t_CheckExitStatus 0       
-  exit 0
-fi
-
 mysql -u root -e 'drop database mysql_test' >/dev/null 2>&1
 t_CheckExitStatus $?
diff --git a/tests/p_mysql/25_mysqld_grant_test.sh b/tests/p_mysql/25_mysqld_grant_test.sh
index e6e9704..da21c00 100755
--- a/tests/p_mysql/25_mysqld_grant_test.sh
+++ b/tests/p_mysql/25_mysqld_grant_test.sh
@@ -3,13 +3,6 @@
 
 t_Log "Running $0 - MySQL GRANT privileges test"
 
-if [ $centos_ver -gt 6 ]
-then
-  t_Log 'mysql is only supported on C5 and C6, skipping'
-  t_CheckExitStatus 0       
-  exit 0
-fi
-
 mysql -u root -e 'create database mysql_test;'  > /dev/null 2>&1
 mysql -u root -e "grant all on mysql_test.* to mysql_test@localhost identified by 'mysqltest'"  > /dev/null 2>&1
 mysql -u root -e "flush privileges;" > /dev/null 2>&1