diff --git a/xCAT-test/autotest/testcase/installation/SN_setup_case b/xCAT-test/autotest/testcase/installation/SN_setup_case index 9ccde6576..862fb291c 100644 --- a/xCAT-test/autotest/testcase/installation/SN_setup_case +++ b/xCAT-test/autotest/testcase/installation/SN_setup_case @@ -1,5 +1,13 @@ start:SN_setup_case os:Linux +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ check:rc==0 @@ -22,7 +30,8 @@ cmd:makedhcp -a check:rc==0 cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi check:output=~$$SN - +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:chdef -t node $$SN groups=service,all check:rc==0 cmd:chdef -t group -o service profile=service primarynic=mac installnic=mac diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat index 2d3b96197..4dbf7365b 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -1,6 +1,13 @@ start:reg_linux_diskfull_installation_flat os:Linux - +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi cmd:MINIISO=NUll;if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] && [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64le" ]];then mkdir /tmp/iso; mount -o loop $$MINIISO /tmp/iso ; mkdir -p /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot; cp /tmp/iso/install/initrd.gz /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot;umount /tmp/iso; rmdir /tmp/iso; fi check:rc==0 @@ -29,6 +36,8 @@ check:rc==0 cmd:sleep 10 cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done check:rc==0 +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:copycds $$ISO check:rc==0 cmd:if [[ -f /tmp/test.synclist ]] ;then mv /tmp/test.synclist /tmp/test.synclist.bak;fi; diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy index 2501064c1..ac832a2df 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy @@ -1,6 +1,13 @@ start:reg_linux_diskfull_installation_hierarchy os:Linux - +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:chdef -t node -o $$CN servicenode=$$SN monserver=$$SN nfsserver=$$SN tftpserver=$$SN xcatmaster=$$SN check:rc==0 cmd:chdef -t node $$SN groups=service,all @@ -24,6 +31,9 @@ cmd:makedhcp -a check:rc==0 cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done check:rc==0 +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 + cmd:copycds $$ISO check:rc==0 cmd:if [[ -f /tmp/test.synclist ]] ;then mv /tmp/test.synclist /tmp/test.synclist.bak;fi; diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat index af959e324..bc260728d 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat @@ -1,6 +1,13 @@ start:reg_linux_diskless_installation_flat os:Linux - +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN check:rc==0 @@ -19,7 +26,8 @@ cmd:makedhcp -a check:rc==0 cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done check:rc==0 - +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:copycds $$ISO check:rc==0 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy index 4a083478a..d506e8bf8 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -1,6 +1,13 @@ start:reg_linux_diskless_installation_hierarchy os:Linux - +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:chdef -t node -o $$CN servicenode=$$SN monserver=$$SN nfsserver=$$SN tftpserver=$$SN xcatmaster=$$SN check:rc==0 cmd:chdef -t node $$SN groups=service,all @@ -23,6 +30,8 @@ cmd:service dhcpd restart check:rc==0 cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done check:rc==0 +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:copycds $$ISO check:rc==0 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index fe31a9c33..7738a7ec3 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -1,5 +1,13 @@ start:reg_linux_statelite_installation_flat os:Linux +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN check:rc==0 @@ -15,6 +23,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:copycds $$ISO check:rc==0 @@ -79,6 +89,13 @@ check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~compute/rootimg on / type nfs cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" +cmd:xdsh $$CN "echo "test"> /test.statelite" +check:rc==0 +cmd:xdsh $$CN cat /test.statelite +check:rc==0 +check:output=~test +cmd:xdsh $$CN rm -rf /test.statelite +check:rc==0 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 @@ -115,6 +132,13 @@ cmd:ping $$CN -c 3 check:rc==0 check:output=~64 bytes from $$CN cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" +cmd:xdsh $$CN "echo "test"> /test.statelite" +check:rc==0 +cmd:xdsh $$CN cat /test.statelite +check:rc==0 +check:output=~test +cmd:xdsh $$CN rm -rf /test.statelite +check:rc==0 cmd:rm -rf /tmp/image;mkdir /tmp/image check:rc==0 cmd:imgexport __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute /tmp/image/image.tgz 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 64098d579..a40c9d7e6 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 @@ -1,5 +1,13 @@ start:reg_linux_statelite_installation_hierarchy_by_nfs os:Linux +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:chdef -t node -o $$CN servicenode=$$SN monserver=$$SN nfsserver=$$SN tftpserver=$$SN xcatmaster=$$SN check:rc==0 @@ -17,6 +25,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:copycds $$ISO check:rc==0 @@ -87,6 +97,13 @@ check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~compute/rootimg on / type nfs cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" +cmd:xdsh $$CN "echo "test"> /test.statelite" +check:rc==0 +cmd:xdsh $$CN cat /test.statelite +check:rc==0 +check:output=~test +cmd:xdsh $$CN rm -rf /test.statelite +check:rc==0 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 end 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 ab4d5d101..4cce48c31 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 @@ -1,6 +1,13 @@ start:reg_linux_statelite_installation_hierarchy_by_ramdisk os:Linux - +cmd:df +check:rc==0 +cmd:fdisk -l +check:rc==0 +cmd:cat /proc/meminfo +check:rc==0 +cmd:cat /proc/cpuinfo +check:rc==0 cmd:chdef -t node -o $$CN servicenode=$$SN monserver=$$SN nfsserver=$$SN tftpserver=$$SN xcatmaster=$$SN check:rc==0 cmd:chdef -t node $$SN groups=service,all @@ -17,7 +24,8 @@ cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 - +cmd:if cat /var/lib/*/dhcpd.leases ;then exit 0 ;else cat /var/lib/*/*/dhcpd.leases;fi +check:rc==0 cmd:copycds $$ISO check:rc==0 cmd:xdsh $$SN df|grep /install;if [ $? -eq 0 ] ;then xdsh $$SN umount /install;fi @@ -90,6 +98,13 @@ check:rc==0 check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~rootfs on / type cmd:xdsh $$CN "cat /var/log/xcat/xcat.log" +cmd:xdsh $$CN "echo "test"> /test.statelite" +check:rc==0 +cmd:xdsh $$CN cat /test.statelite +check:rc==0 +check:output=~test +cmd:xdsh $$CN rm -rf /test.statelite +check:rc==0 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 end