From 4ed604ffb070bc9c529f676bcf0c906a87f2f8ba Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Fri, 28 Feb 2020 09:55:38 -0500
Subject: [PATCH] Install repoquery for go-xcat testcases

---
 xCAT-server/share/xcat/tools/go-xcat               |  2 +-
 .../autotest/testcase/commoncmd/retry_install.sh   | 12 ++++++++----
 xCAT-test/autotest/testcase/go_xcat/case3          | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index bc8acfcc1..948f0863a 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -626,7 +626,7 @@ function check_repo_version_yum()
 {
 	type yum >/dev/null 2>&1 || return 255
 	check_executes repoquery
-	exit_if_bad "$?" "Install the \`yum-utils' package and rerun."
+	exit_if_bad "$?" "Install the \`yum-utils' or \`dnf-utils' package and rerun."
 	local -a name=()
 	local -a ver=()
 	while read -r name ver
diff --git a/xCAT-test/autotest/testcase/commoncmd/retry_install.sh b/xCAT-test/autotest/testcase/commoncmd/retry_install.sh
index 816ebda15..770033781 100755
--- a/xCAT-test/autotest/testcase/commoncmd/retry_install.sh
+++ b/xCAT-test/autotest/testcase/commoncmd/retry_install.sh
@@ -21,10 +21,14 @@ for (( tryreinstall = 1 ; tryreinstall < $times ; ++tryreinstall ))
 do
     echo "[$tryreinstall] Trying to install $node with $osimage ..."
 
-    echo "Memory on vmhost $vmhost"
-    ssh $vmhost free -g
-    echo "Active VMs on vmhost $vmhost"
-    ssh $vmhost virsh list
+    if [[ ! -z $vmhost ]];then
+        # Display memory and active VMs on VM host, when installing on VM
+        echo "Memory on vmhost $vmhost"
+        ssh $vmhost free -g
+        echo "Active VMs on vmhost $vmhost"
+        ssh $vmhost virsh list
+    fi
+
     echo "rinstall $node osimage=$osimage"
     rinstall $node osimage=$osimage
     if [ $? != 0 ];then
diff --git a/xCAT-test/autotest/testcase/go_xcat/case3 b/xCAT-test/autotest/testcase/go_xcat/case3
index 3131e3dba..9844319da 100644
--- a/xCAT-test/autotest/testcase/go_xcat/case3
+++ b/xCAT-test/autotest/testcase/go_xcat/case3
@@ -19,6 +19,9 @@ check:output=~booted
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
 check:rc==0
 
+#Install additional packages on Red Hat
+cmd:if xdsh $$CN "grep \"Red Hat\" /etc/*release >/dev/null"; then xdsh $$CN"yum install -y yum-utils dnf-utils bzip2"; fi
+
 #Install devel version of xCAT
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y install"
 check:rc==0
@@ -52,6 +55,9 @@ check:output=~booted
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
 check:rc==0
 
+#Install additional packages on Red Hat
+cmd:if xdsh $$CN "grep \"Red Hat\" /etc/*release >/dev/null"; then xdsh $$CN"yum install -y yum-utils dnf-utils bzip2"; fi
+
 #Install GA version of xCAT
 cmd:xdsh $$CN "cd /; ./go-xcat -y install"
 check:rc==0
@@ -85,6 +91,9 @@ check:output=~booted
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
 check:rc==0
 
+#Install additional packages on Red Hat
+cmd:if xdsh $$CN "grep \"Red Hat\" /etc/*release >/dev/null"; then xdsh $$CN"yum install -y yum-utils dnf-utils bzip2"; fi
+
 #Install GA version of xCAT
 cmd:xdsh $$CN "cd /; ./go-xcat -y install"
 check:rc==0
@@ -128,6 +137,9 @@ check:output=~booted
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
 check:rc==0
 
+#Install additional packages on Red Hat
+cmd:if xdsh $$CN "grep \"Red Hat\" /etc/*release >/dev/null"; then xdsh $$CN"yum install -y yum-utils dnf-utils bzip2"; fi
+
 #Install GA version of xCAT
 cmd:xdsh $$CN "cd /; ./go-xcat -y install"
 check:rc==0
@@ -143,7 +155,7 @@ cmd:xdsh $$CN "cd /; ./go-xcat -y completely uninstall"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc!=0
-check:output=~could not be found|dead
+check:output=~could not be found|dead|no such service xcatd
 
 #Install devel version of xCAT
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y install"