From a263c177ee68915b0b92b3d11197dbc06429f1c6 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Sep 18 2020 20:20:36 +0000 Subject: relax some of the os-release checks on CentOS Stream --- diff --git a/tests/p_centos-release/centos-release_os-release.sh b/tests/p_centos-release/centos-release_os-release.sh index cd9d09b..fc20a2f 100755 --- a/tests/p_centos-release/centos-release_os-release.sh +++ b/tests/p_centos-release/centos-release_os-release.sh @@ -4,16 +4,21 @@ t_Log "Running $0 - /etc/os-release has correct ABRT string for CentOS $centos_ver" 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 - t_Log "missing string $string in os-release file !" - exit 1 - fi - done + if [[ $centos_stream == "no" ]]; 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 + t_Log "missing string $string in os-release file !" + exit 1 + fi + done + else + echo "Skipping for CentOS Stream" ; exit 0 + fi else echo "Skipping for CentOS 5 and 6 ..." ; exit 0 + fi t_CheckExitStatus $?