From addeeee5da7a29682e0b54ac480d8c16c83b5c2c Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Thu, 29 Dec 2016 02:15:08 -0500 Subject: [PATCH 1/3] add makentp case to synchronize time with external ntp server --- xCAT-test/autotest/testcase/makentp/cases0 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0 index b47ff3316..ec4c5dc2a 100644 --- a/xCAT-test/autotest/testcase/makentp/cases0 +++ b/xCAT-test/autotest/testcase/makentp/cases0 @@ -100,3 +100,25 @@ check:rc==0 cmd:rm -rf /tmp/postscript end + +start:makentp_initialize +descriptiop:start ntp service on management node and synchronize time with external ntp server +cmd:chtab key=extntpservers site.value="$$extntpserversip" +check:rc==0 +cmd:makentp -V +check:rc==0 +check:output=~configuring management node: $$MN +check:output=~checking if nptd is installed +check:output=~backing up the ntp configuration file /etc/ntp.conf +check:output=~ntp servers are: $$extntpserversip +check:output=~stopping ntpserver +check:output=~starting ntpserver +check:output=~enabling ntpserver +cmd:if [ -f "/usr/sbin/ntp-wait" ];then ntp-wait; else sleep 1200; fi +check:rc==0 +cmd:ntpq -p +check:output=~*$$extntpserversip +cmd:grep $$extntpserversip /etc/ntpd.conf +check:rc==0 +end + From 9a8a383dc0b04e6ea3336bc00f425fc745d51bad Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Wed, 4 Jan 2017 03:55:03 -0500 Subject: [PATCH 2/3] update according to the comments --- xCAT-test/autotest/testcase/makentp/cases0 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0 index ec4c5dc2a..75a137919 100644 --- a/xCAT-test/autotest/testcase/makentp/cases0 +++ b/xCAT-test/autotest/testcase/makentp/cases0 @@ -114,11 +114,8 @@ check:output=~ntp servers are: $$extntpserversip check:output=~stopping ntpserver check:output=~starting ntpserver check:output=~enabling ntpserver -cmd:if [ -f "/usr/sbin/ntp-wait" ];then ntp-wait; else sleep 1200; fi +cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] || [[ "__GETNODEATTR($$CN,os)__" = "sles11.4" ]];then service ntp status;else service ntpd status; fi check:rc==0 -cmd:ntpq -p -check:output=~*$$extntpserversip -cmd:grep $$extntpserversip /etc/ntpd.conf +cmd:a=0;while ! `ntpq -n -c peers | awk '{print \$1}'|grep "*" >/dev/null`; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done check:rc==0 end - From 4f3d7e786480de0a7977698e03597874076e932b Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Thu, 12 Jan 2017 03:11:48 -0500 Subject: [PATCH 3/3] update according to comments --- xCAT-test/autotest/testcase/makentp/cases0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0 index 75a137919..17ac57c65 100644 --- a/xCAT-test/autotest/testcase/makentp/cases0 +++ b/xCAT-test/autotest/testcase/makentp/cases0 @@ -116,6 +116,6 @@ check:output=~starting ntpserver check:output=~enabling ntpserver cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] || [[ "__GETNODEATTR($$CN,os)__" = "sles11.4" ]];then service ntp status;else service ntpd status; fi check:rc==0 -cmd:a=0;while ! `ntpq -n -c peers | awk '{print \$1}'|grep "*" >/dev/null`; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done +cmd:a=0;until ntpq -n -c peers | tail -n +2 | grep -q '^*'; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done check:rc==0 end