From 9f27be5b67bc40bd4f0833bdc6cae083ed33cf1d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 3 Mar 2017 11:06:32 +0800 Subject: [PATCH 1/4] Testcase for smoke test of `updatenodes -S` --- xCAT-test/autotest/testcase/updatenode/cases2 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 xCAT-test/autotest/testcase/updatenode/cases2 diff --git a/xCAT-test/autotest/testcase/updatenode/cases2 b/xCAT-test/autotest/testcase/updatenode/cases2 new file mode 100644 index 000000000..ef55f2615 --- /dev/null +++ b/xCAT-test/autotest/testcase/updatenode/cases2 @@ -0,0 +1,6 @@ +start:updatenode_S +check:rc==0 +cmd:updatenode $$CN -S >/tmp/updatenode.S.out +cmd:grep 'Running of Software Maintenance has completed' /tmp/updatenode.S.out +check:rc==0 +end From e2ebc6a04968038e9e69c6fcd0ae43707c001387 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Tue, 7 Mar 2017 13:02:52 +0800 Subject: [PATCH 2/4] Add testcase for actual package installation testing against `updatenode -S` --- xCAT-test/autotest/testcase/updatenode/cases2 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/updatenode/cases2 b/xCAT-test/autotest/testcase/updatenode/cases2 index ef55f2615..06201a066 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases2 +++ b/xCAT-test/autotest/testcase/updatenode/cases2 @@ -1,6 +1,18 @@ start:updatenode_S -check:rc==0 cmd:updatenode $$CN -S >/tmp/updatenode.S.out cmd:grep 'Running of Software Maintenance has completed' /tmp/updatenode.S.out check:rc==0 end + +start:updatenode_S_gcc +cmd:lsdef $$CN -i provmethod | tail -n 1 | cut -d= -f2 | xargs lsdef -t osimage -i pkglist | tail -n 1 | cut -d= -f2 >/tmp/pkglist.filename +cmd:mv `cat /tmp/pkglist.filename` `cat /tmp/pkglist.filename`.save +cmd:cp `cat /tmp/pkglist.filename`.save `cat /tmp/pkglist.filename` +cmd:echo gcc >>`cat /tmp/pkglist.filename` +cmd:updatenode $$CN -S >/tmp/updatenode.S.out +cmd:grep 'postscript: ospkgs exited with code 0' /tmp/updatenode.S.out +check:rc==0 +cmd:grep 'Running of Software Maintenance has completed' /tmp/updatenode.S.out +check:rc==0 +cmd:mv `cat /tmp/pkglist.filename`.save `cat /tmp/pkglist.filename` +end From 936c35814b2823995d49295b761527bd79edacf1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Mon, 20 Mar 2017 14:31:12 +0800 Subject: [PATCH 3/4] Update the test case for "updatenode -S", and check if package gcc is really installed on the compute node --- xCAT-test/autotest/testcase/updatenode/cases2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT-test/autotest/testcase/updatenode/cases2 b/xCAT-test/autotest/testcase/updatenode/cases2 index 06201a066..f413ff7b7 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases2 +++ b/xCAT-test/autotest/testcase/updatenode/cases2 @@ -15,4 +15,6 @@ check:rc==0 cmd:grep 'Running of Software Maintenance has completed' /tmp/updatenode.S.out check:rc==0 cmd:mv `cat /tmp/pkglist.filename`.save `cat /tmp/pkglist.filename` +cmd:xdsh $$CN '(rpm -qa || dpkg -l) | grep gcc' | grep gcc +check:rc==0 end From 848b50c8acd7df034e74e24318d77d3ae7364df8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Mon, 20 Mar 2017 17:09:12 +0800 Subject: [PATCH 4/4] Do cleanup --- xCAT-test/autotest/testcase/updatenode/cases2 | 1 + 1 file changed, 1 insertion(+) diff --git a/xCAT-test/autotest/testcase/updatenode/cases2 b/xCAT-test/autotest/testcase/updatenode/cases2 index f413ff7b7..9ba8c73e5 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases2 +++ b/xCAT-test/autotest/testcase/updatenode/cases2 @@ -15,6 +15,7 @@ check:rc==0 cmd:grep 'Running of Software Maintenance has completed' /tmp/updatenode.S.out check:rc==0 cmd:mv `cat /tmp/pkglist.filename`.save `cat /tmp/pkglist.filename` +cmd:rm -f /tmp/pkglist.filename cmd:xdsh $$CN '(rpm -qa || dpkg -l) | grep gcc' | grep gcc check:rc==0 end