From ee15e6b73bc4c7b3ef66184b470eae5ea7bd9f7d Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 13 Feb 2019 02:17:24 -0500 Subject: [PATCH 1/2] update case xcatconfig_c to make it to run on hierarchy environment --- xCAT-test/autotest/testcase/xcatconfig/case0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0 index f66c6cb8b..8fd0dccc7 100644 --- a/xCAT-test/autotest/testcase/xcatconfig/case0 +++ b/xCAT-test/autotest/testcase/xcatconfig/case0 @@ -119,6 +119,10 @@ cmd:rm -rf /tmp/xcatconfig.test check:rc==0 cmd:mv -f /etc/xcat/cabak /etc/xcat/ca ;mv -f /etc/xcat/certbak /etc/xcat/cert check:rc==0 +cmd:if lsdef service > /dev/null 2>&1; then updatenode service -P servicenode;fi +check:rc==0 +cmd:if lsdef service > /dev/null 2>&1; then makedhcp -a;fi +check:rc==0 end start:xcatconfig_s From 214d3ea3967050acf39020ae5ab2b3531fffa4bb Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 13 Feb 2019 03:08:59 -0500 Subject: [PATCH 2/2] update test command for xcatconfig -c --- xCAT-test/autotest/testcase/xcatconfig/case0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0 index 8fd0dccc7..bb7f0b4dd 100644 --- a/xCAT-test/autotest/testcase/xcatconfig/case0 +++ b/xCAT-test/autotest/testcase/xcatconfig/case0 @@ -121,7 +121,7 @@ cmd:mv -f /etc/xcat/cabak /etc/xcat/ca ;mv -f /etc/xcat/certbak /etc/xcat/cert check:rc==0 cmd:if lsdef service > /dev/null 2>&1; then updatenode service -P servicenode;fi check:rc==0 -cmd:if lsdef service > /dev/null 2>&1; then makedhcp -a;fi +cmd:if lsdef service > /dev/null 2>&1; then xdsh $$CN date;fi check:rc==0 end