From c2e4f98712cb1df2077ffa1891b1a9f3b98b68db Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jun 25 2020 20:06:19 +0000 Subject: do not do the anaconda test in c8 --- diff --git a/tests/p_anaconda/0-install_anaconda.sh b/tests/p_anaconda/0-install_anaconda.sh index 5e6a53c..6c722a0 100755 --- a/tests/p_anaconda/0-install_anaconda.sh +++ b/tests/p_anaconda/0-install_anaconda.sh @@ -2,6 +2,10 @@ # Author: Athmane Madjoudj uname_arch=$(uname -m) +if [ "$centos_ver" -eq "8" ]; then + t_Log "c8 => SKIPPING" + exit 0 +fi if [ "$uname_arch" == "armv7l" ]; then t_Log "*** Not testing on Arch: $uname_arch ***" diff --git a/tests/p_anaconda/anaconda_centos_patch.sh b/tests/p_anaconda/anaconda_centos_patch.sh index aae402e..795fde3 100755 --- a/tests/p_anaconda/anaconda_centos_patch.sh +++ b/tests/p_anaconda/anaconda_centos_patch.sh @@ -4,6 +4,10 @@ t_Log "Running $0 - CentOS Anaconda patch is applied test." uname_arch=$(uname -m) +if [ "$centos_ver" -eq "8" ]; then + t_Log "c8 => SKIPPING" + exit 0 +fi if [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "i686" ] || [ "$uname_arch" == "armv7l" ]; then t_Log "*** Not testing on Arch: $uname_arch ***" @@ -13,9 +17,6 @@ fi if [ "$centos_ver" = "7" ];then ANACONDA_PATH=/usr/lib64/python2.7/site-packages/pyanaconda/ ANACONDA_FILE="centos.py" -elif [ "$centos_ver" = "8" ];then - ANACONDA_PATH=/usr/lib64/python3.6/site-packages/pyanaconda/ - ANACONDA_FILE="centos.py" else ANACONDA_PATH=/usr/lib/anaconda/ ANACONDA_FILE="rhel.py"