diff --git a/tests/p_ipa-server/0-preclean.sh b/tests/p_ipa-server/0-preclean.sh index 3477f86..ab445f2 100755 --- a/tests/p_ipa-server/0-preclean.sh +++ b/tests/p_ipa-server/0-preclean.sh @@ -1,6 +1,10 @@ #!/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 53c9b3c..740ab33 100755 --- a/tests/p_ipa-server/1-install_freeipa.sh +++ b/tests/p_ipa-server/1-install_freeipa.sh @@ -1,6 +1,10 @@ #!/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 492498a..3927d92 100755 --- a/tests/p_ipa-server/2-configure_freeipa.sh +++ b/tests/p_ipa-server/2-configure_freeipa.sh @@ -1,6 +1,11 @@ #!/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 7f361ec..5d617fe 100755 --- a/tests/p_ipa-server/3-verify_kerberos_tickets.sh +++ b/tests/p_ipa-server/3-verify_kerberos_tickets.sh @@ -1,6 +1,10 @@ #!/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 72c3f91..90ac82e 100755 --- a/tests/p_ipa-server/4-adduser.sh +++ b/tests/p_ipa-server/4-adduser.sh @@ -1,6 +1,10 @@ #!/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 2d918b5..1c2850c 100755 --- a/tests/p_ipa-server/5-addservice.sh +++ b/tests/p_ipa-server/5-addservice.sh @@ -1,6 +1,10 @@ #!/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 0bb4ba4..849101b 100755 --- a/tests/p_ipa-server/6-dnsdetails.sh +++ b/tests/p_ipa-server/6-dnsdetails.sh @@ -1,6 +1,10 @@ #!/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 5ab8c18..d72ecf9 100755 --- a/tests/p_ipa-server/7-addsudo.sh +++ b/tests/p_ipa-server/7-addsudo.sh @@ -1,6 +1,10 @@ #!/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 3277479..2a92e9f 100755 --- a/tests/p_ipa-server/99-postclean.sh +++ b/tests/p_ipa-server/99-postclean.sh @@ -1,6 +1,10 @@ #!/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