From 778b77955d23649945136069f377ff013733146f Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: May 24 2022 15:57:14 +0000 Subject: remove all PRE_UPDATES variables from tests as we no longer use that CI system --- diff --git a/tests/p_ipa-server/0-preclean.sh b/tests/p_ipa-server/0-preclean.sh index ab445f2..3477f86 100644 --- a/tests/p_ipa-server/0-preclean.sh +++ b/tests/p_ipa-server/0-preclean.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') then diff --git a/tests/p_ipa-server/1-install_freeipa.sh b/tests/p_ipa-server/1-install_freeipa.sh index 740ab33..53c9b3c 100644 --- a/tests/p_ipa-server/1-install_freeipa.sh +++ b/tests/p_ipa-server/1-install_freeipa.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/2-configure_freeipa.sh b/tests/p_ipa-server/2-configure_freeipa.sh index 3927d92..0cea899 100644 --- a/tests/p_ipa-server/2-configure_freeipa.sh +++ b/tests/p_ipa-server/2-configure_freeipa.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/3-verify_kerberos_tickets.sh b/tests/p_ipa-server/3-verify_kerberos_tickets.sh index 5d617fe..7f361ec 100644 --- a/tests/p_ipa-server/3-verify_kerberos_tickets.sh +++ b/tests/p_ipa-server/3-verify_kerberos_tickets.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/4-adduser.sh b/tests/p_ipa-server/4-adduser.sh index 90ac82e..72c3f91 100644 --- a/tests/p_ipa-server/4-adduser.sh +++ b/tests/p_ipa-server/4-adduser.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/5-addservice.sh b/tests/p_ipa-server/5-addservice.sh index 1c2850c..2d918b5 100644 --- a/tests/p_ipa-server/5-addservice.sh +++ b/tests/p_ipa-server/5-addservice.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/6-dnsdetails.sh b/tests/p_ipa-server/6-dnsdetails.sh index 849101b..0bb4ba4 100644 --- a/tests/p_ipa-server/6-dnsdetails.sh +++ b/tests/p_ipa-server/6-dnsdetails.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/7-addsudo.sh b/tests/p_ipa-server/7-addsudo.sh index d72ecf9..5ab8c18 100644 --- a/tests/p_ipa-server/7-addsudo.sh +++ b/tests/p_ipa-server/7-addsudo.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/p_ipa-server/99-postclean.sh b/tests/p_ipa-server/99-postclean.sh index 2a92e9f..3277479 100644 --- a/tests/p_ipa-server/99-postclean.sh +++ b/tests/p_ipa-server/99-postclean.sh @@ -1,10 +1,6 @@ #!/bin/bash # Author: James Hogarth # -if [ "$PRE_UPDATES" == "1" ]; then - t_Log "skipping $0 for pre update testing" - exit 0 -fi if (t_GetPkgRel basesystem | grep -qE 'el(6|7)') && !(t_GetArch | grep -qE 'aarch64') then diff --git a/tests/r_check_mod_packages/01_modpackages.sh b/tests/r_check_mod_packages/01_modpackages.sh index 788aa06..a76cac1 100755 --- a/tests/r_check_mod_packages/01_modpackages.sh +++ b/tests/r_check_mod_packages/01_modpackages.sh @@ -4,7 +4,7 @@ uname_arch=$(uname -m) -if [ $SKIP_QA_HARNESS -eq 1 ] && [ "$PRE_UPDATES" != "1" ] ; then +if [ $SKIP_QA_HARNESS -eq 1 ] ; then t_Log "Skip $0 in non QA harness environment" ret_val=0 else diff --git a/tests/z_repoclosure/repoclosure_test.sh b/tests/z_repoclosure/repoclosure_test.sh index d0a1251..b519273 100755 --- a/tests/z_repoclosure/repoclosure_test.sh +++ b/tests/z_repoclosure/repoclosure_test.sh @@ -5,7 +5,7 @@ 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 ] && [ "$PRE_UPDATES" != "1" ] ; then +elif [ $SKIP_QA_HARNESS -eq 1 ] ; then t_Log "Skip this test in non QA harness environment" else