From f2e52dacafc3f575ef46af401a680134c3a5808a Mon Sep 17 00:00:00 2001 From: junxiawang Date: Thu, 26 Nov 2015 05:33:12 -0500 Subject: [PATCH] modify autotest instal case --- xCAT-test/autotest/bundle/le_rhels_cmd.bundle | 3 -- xCAT-test/autotest/bundle/le_sles_cmd.bundle | 3 -- .../ubuntu_diskless_installation_p8le | 28 +++++++------------ .../ubuntu_full_installation_p8le | 28 ++++++------------- 4 files changed, 18 insertions(+), 44 deletions(-) diff --git a/xCAT-test/autotest/bundle/le_rhels_cmd.bundle b/xCAT-test/autotest/bundle/le_rhels_cmd.bundle index 3befb4944..91def4d65 100644 --- a/xCAT-test/autotest/bundle/le_rhels_cmd.bundle +++ b/xCAT-test/autotest/bundle/le_rhels_cmd.bundle @@ -31,9 +31,6 @@ lsdef_t lsdef_t_i_o lsdef_t_w lsdef_t_err -lslite_i -lslite_noderange -lslite_h makeconservercf_null makeconservercf_noderange makeconservercf_d diff --git a/xCAT-test/autotest/bundle/le_sles_cmd.bundle b/xCAT-test/autotest/bundle/le_sles_cmd.bundle index 126009df1..a840d726e 100644 --- a/xCAT-test/autotest/bundle/le_sles_cmd.bundle +++ b/xCAT-test/autotest/bundle/le_sles_cmd.bundle @@ -33,9 +33,6 @@ lsdef_t lsdef_t_i_o lsdef_t_w lsdef_t_err -lslite_i -lslite_noderange -lslite_h makeconservercf_null makeconservercf_noderange makeconservercf_d diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_p8le b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_p8le index a39034314..16625960a 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_p8le +++ b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_p8le @@ -1,19 +1,21 @@ -start:Ubuntu_diskless_installation_flat_p8le_vm +start:Ubuntu_diskless_installation_flat_p8_le os:Linux -cmd:makedns -n +cmd:copycds $$ISO check:rc==0 -cmd:makeconservercf $$CN +cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]];then chdef -t node -o $$CN vmstorage=dir:///var/lib/libvirt/images/ && rmvm $$CN -f && mkvm $$CN ; fi +cmd:makedns -n check:rc==0 cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:if [ ! -d /install/custom/netboot/ubuntu ]; then mkdir -p /install/custom/netboot/ubuntu; fi +cmd:makeconservercf $$CN check:rc==0 -cmd:if [ ! -e /install/custom/netboot/ubuntu/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/ubuntu/compute.synclist; fi +cmd:if cat /etc/*release |grep SUSE >/dev/null;then if [ ! -d /install/custom/netboot/sles ]; then mkdir -p /install/custom/netboot/sles; fi; elif cat /etc/*release |grep "Red Hat" >/dev/null;then if [ ! -d /install/custom/netboot/rh ]; then mkdir -p /install/custom/netboot/rh; fi; elif cat /etc/*release |grep "Ubuntu" >/dev/null;then if [ ! -d /install/custom/netboot/ubuntu ]; then mkdir -p /install/custom/netboot/ubuntu; fi; fi check:rc==0 -cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/ubuntu/compute.synclist -cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/x86_64/compute +cmd:if cat /etc/*release |grep SUSE >/dev/null;then if [ ! -e /install/custom/netboot/sles/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/sles/compute.synclist; fi; elif cat /etc/*release |grep "Red Hat" >/dev/null;then if [ ! -e /install/custom/netboot/rh/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/rh/compute.synclist; fi; elif cat /etc/*release |grep "Ubuntu" >/dev/null;then if [ ! -e /install/custom/netboot/ubuntu/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/ubuntu/compute.synclist;fi; fi +check:rc==0 +cmd:if cat /etc/*release |grep SUSE >/dev/null;then chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/sles/compute.synclist; elif cat /etc/*release |grep "Red Hat" >/dev/null;then chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/rh/compute.synclist;elif cat /etc/*release |grep "Ubuntu" >/dev/null; then chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/ubuntu/compute.synclist;fi check:rc==0 cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute check:rc==0 @@ -21,7 +23,7 @@ cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-comput check:rc==0 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute check:rc==0 -cmd:rpower $$CN reset +cmd:rpower $$CN boot check:rc==0 cmd:sleep 200 cmd:lsdef -l $$CN | grep status @@ -39,14 +41,4 @@ check:output=~booted cmd:xdsh $$CN date check:rc==0 check:output=~\d\d:\d\d:\d\d -cmd:nodeset $$CN netboot -check:rc==0 -cmd:rpower $$CN reset -check:rc==0 -cmd:sleep 200 -cmd:lsdef -l $$CN | grep status -check:output=~booted -cmd:xdsh $$CN date -check:rc==0 -check:output=~\d\d:\d\d:\d\d end diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le index 1cd867ea6..a6b86efca 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le @@ -1,35 +1,23 @@ -start:Ubuntu_full_installation_flat_p8le_vm +start:Ubuntu_full_installation_flat_p8_le os:Linux +cmd:copycds $$ISO +check:rc==0 cmd:makedns -n check:rc==0 -cmd:makeconservercf $$CN -check:rc==0 -cmd:cat /etc/conserver.cf | grep $$CN -check:output=~$$CN cmd:sleep 60 cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 -cmd:copycds $$ISO +cmd:makeconservercf $$CN check:rc==0 +cmd:cat /etc/conserver.cf | grep $$CN +check:output=~$$CN cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute check:rc==0 -cmd:rpower $$CN reset +cmd:rpower $$CN boot check:rc==0 -cmd:sleep 2000 -cmd:ping $$CN -c 3 -check:output=~64 bytes from $$CN -cmd:lsdef -l $$CN | grep status -check:output=~booted -cmd:xdsh $$CN date -check:rc==0 -check:output=~\d\d:\d\d:\d\d -cmd:nodeset $$CN osimage -check:rc==0 -cmd:rpower $$CN reset -check:rc==0 -cmd:sleep 2000 +cmd:sleep 3000 cmd:ping $$CN -c 3 check:output=~64 bytes from $$CN cmd:lsdef -l $$CN | grep status