From ea7584d305455d4b3c2aae2eb297ef4c4e256c80 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Tue, 3 Mar 2020 11:34:11 -0500 Subject: [PATCH 1/7] Remove migration1 testcase from weekly bundle --- xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle | 1 - xCAT-test/autotest/bundle/sles_x86_weekly.bundle | 1 - 2 files changed, 2 deletions(-) diff --git a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle index 08534fe146..78327f56c7 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle @@ -17,5 +17,4 @@ 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 index f6928afe4d..76bf7ef205 100644 --- a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle @@ -17,5 +17,4 @@ nodeset_shell reg_linux_diskfull_installation_flat reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat -sles_migration1 sles_migration2 From 8023f6eb435fe3557f81ee00947e191c40f73a6f Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Tue, 3 Mar 2020 11:44:43 -0500 Subject: [PATCH 2/7] Remove migration2 also --- xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle | 1 - xCAT-test/autotest/bundle/sles_x86_weekly.bundle | 1 - 2 files changed, 2 deletions(-) diff --git a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle index 78327f56c7..557c79214a 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_weekly.bundle @@ -17,4 +17,3 @@ nodeset_shell reg_linux_diskfull_installation_flat reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat -sles_migration2 diff --git a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle index 76bf7ef205..8792401aa1 100644 --- a/xCAT-test/autotest/bundle/sles_x86_weekly.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_weekly.bundle @@ -17,4 +17,3 @@ nodeset_shell reg_linux_diskfull_installation_flat reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat -sles_migration2 From 0e7d4104947cc284e88f2562969632ea8543084e Mon Sep 17 00:00:00 2001 From: cxhong Date: Tue, 3 Mar 2020 16:31:18 -0500 Subject: [PATCH 3/7] modify rmimage_diskless test cases --- xCAT-test/autotest/testcase/rmimage/case0 | 1 + 1 file changed, 1 insertion(+) diff --git a/xCAT-test/autotest/testcase/rmimage/case0 b/xCAT-test/autotest/testcase/rmimage/case0 index 991efd372c..7e3795f01e 100644 --- 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 From 9899a0c27a094529a17670d364799de67a228311 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 4 Mar 2020 13:41:50 -0500 Subject: [PATCH 4/7] Add VM memory display to rpower testcase --- xCAT-test/autotest/testcase/rpower/cases0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0 index 8f0c0c0416..1d413dd2d9 100644 --- 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 From 68f2534b9802250ad5406ae491169bc06d1829b9 Mon Sep 17 00:00:00 2001 From: cxhong Date: Wed, 4 Mar 2020 14:19:04 -0500 Subject: [PATCH 5/7] Modify mysqlsetup scripts on rhels7.7 --- xCAT-client/bin/mysqlsetup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup index b9743c9638..edce88e6b9 100755 --- a/xCAT-client/bin/mysqlsetup +++ b/xCAT-client/bin/mysqlsetup @@ -928,6 +928,12 @@ 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 + #use --force to grant table entries use ipaddress instead of hostname + if ($::linuxos == "rhels7.7") { + $cmd = "$cmd --force"; + } } xCAT::Utils->runcmd($cmd, 0); if ($::RUNCMD_RC != 0) From 1e7453e53937896441793764db58bbaaed9bf6ee Mon Sep 17 00:00:00 2001 From: cxhong Date: Wed, 4 Mar 2020 16:02:34 -0500 Subject: [PATCH 6/7] change to symbol links instead force options --- xCAT-client/bin/mysqlsetup | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup index edce88e6b9..588db7011a 100755 --- a/xCAT-client/bin/mysqlsetup +++ b/xCAT-client/bin/mysqlsetup @@ -930,9 +930,12 @@ 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 - #use --force to grant table entries use ipaddress instead of hostname if ($::linuxos == "rhels7.7") { - $cmd = "$cmd --force"; + 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); From 698cf7313ac5f49ffeedfaac0a8efc0bd99af1aa Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 4 Mar 2020 16:24:59 -0500 Subject: [PATCH 7/7] Move 2.15.1 release date --- docs/source/overview/_files/2.15.x.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/overview/_files/2.15.x.csv b/docs/source/overview/_files/2.15.x.csv index 2a67b7574b..6002574dc7 100644 --- 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 `_ +2.15.1,2020-03-06,"RHEL 8.1,RHEL 7.7,SLES 15.0",`2.15.1 Release Notes `_ 2.15.0,2019-11-11,"RHEL 8.0",`2.15.0 Release Notes `_