From 75521c33bf843438b843239f0935b557b42636bc Mon Sep 17 00:00:00 2001 From: litingt Date: Fri, 15 Feb 2019 01:32:17 -0500 Subject: [PATCH 1/2] refine some test cases --- .../reg_linux_diskfull_installation_flat_postscripts_failed | 2 +- .../reg_linux_diskless_installation_flat_postscripts_failed | 2 +- xCAT-test/autotest/testcase/xcatconfig/case0 | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed index 4525200de..511a93fea 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed @@ -41,7 +41,7 @@ cmd:chdef $$CN -p postscripts=test check:rc==0 cmd:lsdef -l $$CN check:rc==0 -cmd:/opt/xcat/share/xcat/tools/autotest/testcase/commoncmd/retry_install.sh $$CN __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute +cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute check:rc==0 check:output=~Provision node\(s\)\: $$CN diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed index 66e5e1cfe..d29e28cd0 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed @@ -47,7 +47,7 @@ cmd:rm -rf /tmp/mountoutput cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute check:rc==0 -cmd:/opt/xcat/share/xcat/tools/autotest/testcase/commoncmd/retry_install.sh $$CN __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute +cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute check:rc==0 check:output=~Provision node\(s\)\: $$CN diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0 index f66c6cb8b..d03d5a305 100644 --- a/xCAT-test/autotest/testcase/xcatconfig/case0 +++ b/xCAT-test/autotest/testcase/xcatconfig/case0 @@ -94,7 +94,6 @@ cmd:rm -rf /tmp/xcatconfig.test check:rc==0 end - start:xcatconfig_c description:To regenerate cretials label:mn_only @@ -117,7 +116,7 @@ check:rc!=0 #step4:restore test environment 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 +cmd:rm -rf /etc/xcat/cabak /etc/xcat/certbak check:rc==0 end From 7a454892336be4d435b885ff37c2748d98c09bcf Mon Sep 17 00:00:00 2001 From: litingt Date: Fri, 15 Feb 2019 01:49:00 -0500 Subject: [PATCH 2/2] update case xcatconfig_c to support hierarchy --- 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 d03d5a305..2beb89f95 100644 --- a/xCAT-test/autotest/testcase/xcatconfig/case0 +++ b/xCAT-test/autotest/testcase/xcatconfig/case0 @@ -118,6 +118,10 @@ cmd:rm -rf /tmp/xcatconfig.test check:rc==0 cmd:rm -rf /etc/xcat/cabak /etc/xcat/certbak 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 xdsh $$CN date;fi +check:rc==0 end start:xcatconfig_s