From 4ff8085fd3ea2fa6e458179c48ad69e22036cc7b Mon Sep 17 00:00:00 2001 From: junxiawang Date: Tue, 29 Mar 2016 07:25:31 -0400 Subject: [PATCH 1/3] modify p8le test case for mini.iso --- .../testcase/installation/ubuntu_full_installation_p8le | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le index 976b02194..790f60c9d 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le @@ -4,13 +4,14 @@ stop=yes cmd:copycds $$ISO check:rc==0 -cmd:makedns -n +cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];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;fi check:rc==0 -cmd:sleep 60 cmd:makedhcp -n check:rc==0 cmd:makedhcp -a check:rc==0 +cmd:makedns -n +check:rc==0 cmd:makeconservercf $$CN check:rc==0 cmd:cat /etc/conserver.cf | grep $$CN From fc6804c434f62112bd0f1b07f7abde2fdb966c1e Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 30 Mar 2016 07:36:47 -0400 Subject: [PATCH 2/3] modify test according to whowutwut's comment for p8le's mini.iso --- .../testcase/installation/ubuntu_full_installation_p8le | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le index 790f60c9d..a76e1a0cb 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le @@ -28,4 +28,8 @@ check:output=~booted cmd:xdsh $$CN date check:rc==0 check:output=~\d\d:\d\d:\d\d +cmd:umount /tmp/iso +check:rc==0 +cmd:rmdir /tmp/iso +check:rc==0 end From 9a5ffb5b4091f9611e9f8973a7d3698f83089cf4 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 30 Mar 2016 08:06:32 -0400 Subject: [PATCH 3/3] modify testcase --- .../testcase/installation/ubuntu_full_installation_p8le | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le index a76e1a0cb..577497c82 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_p8le @@ -4,7 +4,7 @@ stop=yes cmd:copycds $$ISO check:rc==0 -cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];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;fi +cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];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 cmd:makedhcp -n check:rc==0 @@ -28,8 +28,4 @@ check:output=~booted cmd:xdsh $$CN date check:rc==0 check:output=~\d\d:\d\d:\d\d -cmd:umount /tmp/iso -check:rc==0 -cmd:rmdir /tmp/iso -check:rc==0 end