Merge pull request #6622 from xcat2/master

Merge from master to 2.15 branch for 2.15.1 release. (2)
xcat2 · Mar 4, 2020 · ab6295b · ab6295b
2 parents 039f14c + b2f026a
commit ab6295b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/docs/source/overview/_files/2.15.x.csv b/docs/source/overview/_files/2.15.x.csv
@@ -1,5 +1,5 @@
 Version,Release Date,New OS Supported,Release Notes 
 
-2.15.1,2020-03-03,"RHEL 8.1,RHEL 7.7,SLES 15.0",`2.15.1 Release Notes <https://github.com/xcat2/xcat-core/wiki/XCAT_2.15.1_Release_Notes>`_
+2.15.1,2020-03-06,"RHEL 8.1,RHEL 7.7,SLES 15.0",`2.15.1 Release Notes <https://github.com/xcat2/xcat-core/wiki/XCAT_2.15.1_Release_Notes>`_
 2.15.0,2019-11-11,"RHEL 8.0",`2.15.0 Release Notes <https://github.com/xcat2/xcat-core/wiki/XCAT_2.15_Release_Notes>`_
 
diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
@@ -928,6 +928,15 @@ sub initmysqldb
         }
 
         $cmd = "$sqlcmd --user=mysql";
+        #on rhels7.7, /usr/bin/mysql_install_db requires /usr/libexec/resolveip, 
+        #but it's available at the /usr/bin/resolveip
+        if ($::linuxos == "rhels7.7") {
+            my $resolveip="/usr/libexec/resolveip";
+            if (!(-x ($resolveip))) {
+                my $linkcmd="ln -s /usr/bin/resolveip $resolveip";
+                xCAT::Utils->runcmd($linkcmd, 0);
+            }
+        }
     }
     xCAT::Utils->runcmd($cmd, 0);
     if ($::RUNCMD_RC != 0)

diff --git a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle
@@ -17,5 +17,3 @@ nodeset_shell
 reg_linux_diskfull_installation_flat
 reg_linux_diskless_installation_flat
 reg_linux_statelite_installation_flat
-sles_migration1
-sles_migration2
diff --git a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle
@@ -17,5 +17,3 @@ nodeset_shell
 reg_linux_diskfull_installation_flat
 reg_linux_diskless_installation_flat
 reg_linux_statelite_installation_flat
-sles_migration1
-sles_migration2
diff --git a/xCAT-test/autotest/testcase/rmimage/case0 b/xCAT-test/autotest/testcase/rmimage/case0
@@ -23,5 +23,6 @@ check:output=~Image files have been removed successfully from this management no
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc!=0
 check:output=~kernel cannot be found at /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/kernel
+cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute
 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute.bak/;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute;fi
 end
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
@@ -42,6 +42,8 @@ cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
 check:output=~Not Activated|off
+# Display active VMs and memory on VM host
+cmd:vmhost=`lsdef $$CN -i vmhost -c | cut -d '=' -f 2`; if [[ ! -z $vmhost ]]; then echo "Memory on vmhost $vmhost"; ssh $vmhost free -g; echo "Active VMs on vmhost $vmhost"; ssh $vmhost virsh list; fi
 cmd:rpower $$CN boot
 check:rc==0
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done