From c2d6da9cbf2aeaffd3483442df91fe3f6a9bd8fb Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jul 27 2019 21:16:26 +0000 Subject: CentOS8 uses chrony instead of ntp, skip ntp test --- diff --git a/tests/p_ntp/0-install_ntp.sh b/tests/p_ntp/0-install_ntp.sh index 4500806..6e92183 100755 --- a/tests/p_ntp/0-install_ntp.sh +++ b/tests/p_ntp/0-install_ntp.sh @@ -1,5 +1,9 @@ #!/bin/bash # Author: Steve Barnes (steve@echo.id.au) +if [ "$centos_ver" -ge 8 ] ; then + t_Log "no ntp in CentOS $centos_ver ... SKIP" + exit 0 +fi # NTPd t_InstallPackage ntp diff --git a/tests/p_ntp/5-start-check.sh b/tests/p_ntp/5-start-check.sh index 3237dc2..f64083d 100755 --- a/tests/p_ntp/5-start-check.sh +++ b/tests/p_ntp/5-start-check.sh @@ -1,6 +1,9 @@ #!/bin/bash # Author: Steve Barnes (steve@echo.id.au) +if [ "$centos_ver" -ge 8 ] ; then + exit 0 +fi # Start NTPd services and confirm it's running. t_ServiceControl ntpd start diff --git a/tests/p_ntp/ntp_centos_servers.sh b/tests/p_ntp/ntp_centos_servers.sh index 429c2b5..8ccb248 100755 --- a/tests/p_ntp/ntp_centos_servers.sh +++ b/tests/p_ntp/ntp_centos_servers.sh @@ -2,6 +2,9 @@ # Author: Athmane Madjoudj # Ref.: http://bugs.centos.org/view.php?id=4943 +if [ "$centos_ver" -ge 8 ] ; then + exit 0 +fi t_Log "Running $0 - NTP is using CentOS server pool test." grep ".centos.pool.ntp.org" /etc/ntp.conf > /dev/null 2>&1