From 51f69458fa16179cd0698942dcd0ba655ca465d4 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 19 Jul 2016 02:10:09 -0400 Subject: [PATCH 1/2] delete synced file check point --- .../reg_linux_statelite_installation_hierarchy_by_nfs | 11 ++++++----- ..._linux_statelite_installation_hierarchy_by_ramdisk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 0c0f1fd51..0923a1381 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -92,11 +92,12 @@ cmd:xdsh $$CN mount check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~compute/rootimg on / type nfs -cmd:scp $$CN:/etc/resolv.conf /tmp/resolv.conf -check:rc==0 -cmd:diff /etc/resolv.conf /tmp/resolv.conf -check:rc==0 -cmd:rm -f /tmp/resolv.conf + +#cmd:scp $$CN:/etc/resolv.conf /tmp/resolv.conf +#check:rc==0 +#cmd:diff /etc/resolv.conf /tmp/resolv.conf +#check:rc==0 +#cmd:rm -f /tmp/resolv.conf cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi check:rc==0 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk index 0477ac566..ddafeeca8 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk @@ -94,11 +94,12 @@ cmd:xdsh $$CN mount check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~rootfs on / type -cmd:scp $$CN:/etc/resolv.conf /tmp/resolv.conf -check:rc==0 -cmd:diff /etc/resolv.conf /tmp/resolv.conf -check:rc==0 -cmd:rm -f /tmp/resolv.conf + +#cmd:scp $$CN:/etc/resolv.conf /tmp/resolv.conf +#check:rc==0 +#cmd:diff /etc/resolv.conf /tmp/resolv.conf +#check:rc==0 +#cmd:rm -f /tmp/resolv.conf cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 From 1d3a1633245d1155ef8c07d75ea0b024ae8177de Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 19 Jul 2016 02:16:13 -0400 Subject: [PATCH 2/2] delete synced file check points --- .../reg_linux_statelite_installation_hierarchy_by_nfs | 6 ------ .../reg_linux_statelite_installation_hierarchy_by_ramdisk | 6 ------ 2 files changed, 12 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 0923a1381..5606477b8 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -93,12 +93,6 @@ check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~compute/rootimg on / type nfs -#cmd:scp $$CN:/etc/resolv.conf /tmp/resolv.conf -#check:rc==0 -#cmd:diff /etc/resolv.conf /tmp/resolv.conf -#check:rc==0 -#cmd:rm -f /tmp/resolv.conf - cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi check:rc==0 cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk index ddafeeca8..9392285ae 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk @@ -95,12 +95,6 @@ check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~rootfs on / type -#cmd:scp $$CN:/etc/resolv.conf /tmp/resolv.conf -#check:rc==0 -#cmd:diff /etc/resolv.conf /tmp/resolv.conf -#check:rc==0 -#cmd:rm -f /tmp/resolv.conf - cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute