From 62618bc006d15813d25a6efcb0553b59af651991 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jan 02 2019 10:55:57 +0000 Subject: Fix mod-packages tests for armhfp --- diff --git a/tests/r_check_mod_packages/01_modpackages.sh b/tests/r_check_mod_packages/01_modpackages.sh index 42f4651..788aa06 100755 --- a/tests/r_check_mod_packages/01_modpackages.sh +++ b/tests/r_check_mod_packages/01_modpackages.sh @@ -7,18 +7,15 @@ uname_arch=$(uname -m) if [ $SKIP_QA_HARNESS -eq 1 ] && [ "$PRE_UPDATES" != "1" ] ; then t_Log "Skip $0 in non QA harness environment" ret_val=0 -elif [ "$uname_arch" == "armv7l" ] ; then - t_Log "*** Not testing $0 on Arch: $uname_arch ***" - ret_val=0 else ret_val=0 if [ "$centos_ver" = "7" ] ; then - + t_Log "Running $0 - Checking current repositories for .el7.centos on modified files" uname_arch=$(uname -m) yum clean all - for pkg in $(cat tests/r_check_mod_packages/c72-mod-packages.lst.$uname_arch) - do + for pkg in $(cat tests/r_check_mod_packages/c72-mod-packages.lst.$uname_arch|grep -v '^#') + do has_centos=$(yum list $pkg | grep '.el7.centos') if [ "$has_centos" == "" ]; then echo $pkg missing .el7.centos diff --git a/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l b/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l index ca9632c..e9835d1 100644 --- a/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l +++ b/tests/r_check_mod_packages/c72-mod-packages.lst.armv7l @@ -5,30 +5,28 @@ anaconda basesystem centos-indexhtml centos-logos -centos-release -compat-glibc +centos-userland-release +#compat-glibc (not available in armhfp) dhcp firefox -grub2 +#grub2 (not available yet in armhfp) httpd initial-setup ipa-client -kabi-yum-plugins +#kabi-yum-plugins (not available in armhfp) kde-settings libreport ntp -openssl098e +#openssl098e (not available in armhfp) pcs plymouth redhat-rpm-config redhat-lsb scap-security-guide -shim-unsigned-ia32 -shim-unsigned-x64 sos subscription-manager system-config-date system-config-kdump thunderbird -xulrunner +#xulrunner (currently has the wrong disttag, will be fixed on the next update) yum