From 4e7f11a75228a9d1ac36d0fcae1b48631d44a577 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Dec 17 2015 17:16:41 +0000 Subject: Two more fixes for AltArch tests exception --- diff --git a/tests/p_shim/01_shim_secureboot_signed.sh b/tests/p_shim/01_shim_secureboot_signed.sh index 0a7bb4e..6eed34c 100755 --- a/tests/p_shim/01_shim_secureboot_signed.sh +++ b/tests/p_shim/01_shim_secureboot_signed.sh @@ -3,12 +3,12 @@ t_Log "Running $0 - Verifying that shim.efi is correctly signed with correct cert" -if [ "$centos_ver" = "7" ] ; then +if [[ "$centos_ver" = "7" && "$arch" = "x86_64" ]] ; then t_InstallPackage pesign shim pesign --show-signature --in /boot/efi/EFI/centos/shim.efi|grep -q 'Microsoft Windows UEFI Driver Publisher' t_CheckExitStatus $? else - t_log "previous versions than CentOS 7 aren't using shim/secureboot ... skipping" + t_Log "previous versions than CentOS 7 - or not x86_64 arch - aren't using shim/secureboot ... skipping" exit 0 fi diff --git a/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh b/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh index c68993f..87b6042 100755 --- a/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh +++ b/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh @@ -7,6 +7,14 @@ if [ "$PRE_UPDATES" == "1" ]; then exit 0 fi +isAltArch=$(uname -m|egrep -q 'armv7hl|ppc64le'|| echo 1 && echo 0) + +if [ "$isAltArch" = "0" ] ; then + t_Log "Skipping for altarch, using only mirror.centos.org" + t_Log "SKIP" + exit 0 +fi + t_Log "Running $0 - is y-p-fastestmirror enabled." grep 'enabled=1' /etc/yum/pluginconf.d/fastestmirror.conf > /dev/null t_CheckExitStatus $?