From 687a675ca3df041a09d408af4a9cf3b98ee9b794 Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Jul 28 2019 18:05:40 +0000
Subject: Fix centos-release test for CentOS 7 and 8


---

diff --git a/tests/p_centos-release/centos-release_issue.sh b/tests/p_centos-release/centos-release_issue.sh
index 02c2ce3..36d84b2 100755
--- a/tests/p_centos-release/centos-release_issue.sh
+++ b/tests/p_centos-release/centos-release_issue.sh
@@ -2,7 +2,7 @@
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
 t_Log "Running $0 - /etc/issue* has correct branding"
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" -ge 7 ] ; then
   t_Log "CentOS $centos_ver -> SKIP"
   exit 0
 else
diff --git a/tests/p_centos-release/centos-release_os-release.sh b/tests/p_centos-release/centos-release_os-release.sh
index 9cfb673..cd9d09b 100755
--- a/tests/p_centos-release/centos-release_os-release.sh
+++ b/tests/p_centos-release/centos-release_os-release.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 # Author: Fabian Arrotin <arrfab@centos.org>
 
-t_Log "Running $0 - /etc/os-release has correct ABRT string for CentOS 7"
+t_Log "Running $0 - /etc/os-release has correct ABRT string for CentOS $centos_ver"
 
-if [ "$centos_ver" = "7" ];then
-  for string in CENTOS_MANTISBT_PROJECT=\"CentOS-7\" CENTOS_MANTISBT_PROJECT_VERSION=\"7\" REDHAT_SUPPORT_PRODUCT=\"centos\" REDHAT_SUPPORT_PRODUCT_VERSION=\"7\" 
+if [ "$centos_ver" -ge 7 ];then
+  for string in CENTOS_MANTISBT_PROJECT=\"CentOS-$centos_ver\" CENTOS_MANTISBT_PROJECT_VERSION=\"$centos_ver\" REDHAT_SUPPORT_PRODUCT=\"centos\" REDHAT_SUPPORT_PRODUCT_VERSION=\"$centos_ver\"
   do 
     grep -q $string /etc/os-release
     if [ $? -ne "0" ];then
diff --git a/tests/p_centos-release/centos-release_release_compat_symlinks.sh b/tests/p_centos-release/centos-release_release_compat_symlinks.sh
index c8357af..b82b616 100755
--- a/tests/p_centos-release/centos-release_release_compat_symlinks.sh
+++ b/tests/p_centos-release/centos-release_release_compat_symlinks.sh
@@ -2,13 +2,11 @@
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
 t_Log "Running $0 - /etc/centos-release compatibility symbolic links test."
-if (t_GetPkgRel basesystem | grep -q el6)
+if [ "$centos_ver" -ge 6 ]
 then
-
-grep "CentOS" /etc/centos-release >/dev/null 2>&1
-(file /etc/redhat-release | grep "symbolic link to .centos-release."  >/dev/null 2>&1) &&\
-(file /etc/system-release | grep "symbolic link to .centos-release."  >/dev/null 2>&1)
-
+  grep "CentOS" /etc/centos-release >/dev/null 2>&1
+  (file /etc/redhat-release | grep -E "symbolic link to .?centos-release.?"  >/dev/null 2>&1) &&\
+  (file /etc/system-release | grep -E "symbolic link to .?centos-release.?"  >/dev/null 2>&1)
 else
    echo "This test is not comptatible with CentOS <= 5"
 fi