From 826338036c09f2afe82d6dda136af81f5232688d Mon Sep 17 00:00:00 2001 From: junxiawang Date: Thu, 17 Mar 2016 06:56:21 -0400 Subject: [PATCH 1/2] modify autotest case about statelite osimage definition --- .../installation/reg_linux_diskfull_installation_flat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 5a6fcb7d2..be95763b6 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -22,10 +22,9 @@ check:rc==0 cmd:sleep 10 cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi check:output=~$$CN - -cmd:if cat /etc/*release |grep "7.2" |grep "Red Hat">/dev/null;then copycds $$ISO -n rhels7.2;else copycds $$ISO;fi +cmd:copycds $$ISO check:rc==0 -cmd:if cat /etc/*release |grep "7.2" |grep "Red Hat">/dev/null;then mkdef $$STATELITE -u profile=compute provmethod=statelite osvers=rhels7.2;else mkdef $$STATELITE -u profile=compute provmethod=statelite; fi +cmd: mkdef __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute -u profile=compute provmethod=statelite osvers=__GETNODEATTR($$CN,os)__ cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute check:rc==0 cmd:lsdef $$CN |grep provmethod From 199cbe1e9279771a75d395da1ed8e66a8dfeb8c9 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Tue, 7 Jun 2016 06:12:02 -0400 Subject: [PATCH 2/2] delete statelite image definition on diskfull install --- .../testcase/installation/reg_linux_diskfull_installation_flat | 1 - 1 file changed, 1 deletion(-) 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 be95763b6..f38b631f5 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -24,7 +24,6 @@ cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.l check:output=~$$CN cmd:copycds $$ISO check:rc==0 -cmd: mkdef __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute -u profile=compute provmethod=statelite osvers=__GETNODEATTR($$CN,os)__ cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute check:rc==0 cmd:lsdef $$CN |grep provmethod