From 92709f27ccf8d5751eb95eb9610337db557f1204 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Sun, 16 Sep 2018 23:21:02 -0400 Subject: [PATCH 1/2] add a case for bug 1641 go-xcat update will continue even if required repoquery command is not installed --- xCAT-test/autotest/testcase/go-xcat/case5 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 xCAT-test/autotest/testcase/go-xcat/case5 diff --git a/xCAT-test/autotest/testcase/go-xcat/case5 b/xCAT-test/autotest/testcase/go-xcat/case5 new file mode 100644 index 000000000..976df0118 --- /dev/null +++ b/xCAT-test/autotest/testcase/go-xcat/case5 @@ -0,0 +1,18 @@ +start:go_xcat_without_repoquery +description:test go_xcat when command repoquery is not found. This case is for bug 1641. +os:rhels +label:cn_os_ready +cmd:if xdsh $$CN "yum -h";then xdsh $$CN "yum remove -y *xCAT*";fi +cmd:xdsh $$CN "cp -f /usr/bin/repoquery /usr/bin/repoquery.bak" +cmd:xdsh $$CN "cd /; rm -rf /go-xcat" +check:rc==0 +cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./" +check:rc==0 +cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel update -y" +check:rc!=0 +check:output=~Command "repoquery" not found +check:output=~go-xcat: Install the `yum-utils' package and rerun +check:output=~go-xcat: Failed to get package list from repository `xcat-core' +cmd:xdsh $$CN "cp -f /usr/bin/repoquery.bak /usr/bin/repoquery" +end + From 603d5e59b2c5a6a17c0871182b0388a76e5e3d62 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Fri, 21 Sep 2018 02:00:00 -0400 Subject: [PATCH 2/2] update according to comments --- xCAT-test/autotest/testcase/go-xcat/case5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/go-xcat/case5 b/xCAT-test/autotest/testcase/go-xcat/case5 index 976df0118..eba7fb8af 100644 --- a/xCAT-test/autotest/testcase/go-xcat/case5 +++ b/xCAT-test/autotest/testcase/go-xcat/case5 @@ -1,9 +1,9 @@ start:go_xcat_without_repoquery description:test go_xcat when command repoquery is not found. This case is for bug 1641. os:rhels -label:cn_os_ready +label:others,go_xcat cmd:if xdsh $$CN "yum -h";then xdsh $$CN "yum remove -y *xCAT*";fi -cmd:xdsh $$CN "cp -f /usr/bin/repoquery /usr/bin/repoquery.bak" +cmd:xdsh $$CN "mv -f /usr/bin/repoquery /usr/bin/repoquery.bak" cmd:xdsh $$CN "cd /; rm -rf /go-xcat" check:rc==0 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./" @@ -13,6 +13,6 @@ check:rc!=0 check:output=~Command "repoquery" not found check:output=~go-xcat: Install the `yum-utils' package and rerun check:output=~go-xcat: Failed to get package list from repository `xcat-core' -cmd:xdsh $$CN "cp -f /usr/bin/repoquery.bak /usr/bin/repoquery" +cmd:xdsh $$CN "mv -f /usr/bin/repoquery.bak /usr/bin/repoquery" end