From fa677ba818117ed5ec7a8ac990feecc239e7cd71 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: May 24 2022 23:01:27 +0000 Subject: fix z_repoclosure/repoclosure_test.sh and r_check_mod_packages/01_modpackages.sh to run in CentOS CI --- diff --git a/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh b/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh index 930e3c4..95653b1 100755 --- a/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh +++ b/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh @@ -8,11 +8,6 @@ if [ "$centos_ver" -ge "8" ] ; then fi -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi - isAltArch=$(uname -m|egrep -q 'armv7l|aarch64|ppc64|ppc64le'|| echo 1 && echo 0) if [ "$isAltArch" = "0" ] && [ $centos_ver -lt 7 ] ; then diff --git a/tests/r_check_mod_packages/01_modpackages.sh b/tests/r_check_mod_packages/01_modpackages.sh index a76cac1..2edca3c 100755 --- a/tests/r_check_mod_packages/01_modpackages.sh +++ b/tests/r_check_mod_packages/01_modpackages.sh @@ -4,10 +4,6 @@ uname_arch=$(uname -m) -if [ $SKIP_QA_HARNESS -eq 1 ] ; then - t_Log "Skip $0 in non QA harness environment" - ret_val=0 -else ret_val=0 if [ "$centos_ver" = "7" ] ; then @@ -29,4 +25,3 @@ else t_CheckExitStatus $ret_val -fi diff --git a/tests/z_repoclosure/repoclosure_test.sh b/tests/z_repoclosure/repoclosure_test.sh index b519273..6f9390c 100755 --- a/tests/z_repoclosure/repoclosure_test.sh +++ b/tests/z_repoclosure/repoclosure_test.sh @@ -5,8 +5,6 @@ t_Log "Running $0 - repoclosure test ." if [ "$centos_ver" -ge 8 ] ; then t_Log "Skip this test in versions greater than 8, because repoclosure doesn't work with modules enabled" -elif [ $SKIP_QA_HARNESS -eq 1 ] ; then - t_Log "Skip this test in non QA harness environment" else t_InstallPackage yum-utils