From 348cb1d39f62557e27ad63cc29821cb95e8e7978 Mon Sep 17 00:00:00 2001 From: bybai Date: Wed, 27 Mar 2019 23:36:13 -0400 Subject: [PATCH 1/9] add wait ifstate since power NIC ifup is slower in test env --- xCAT/postscripts/configeth | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth index c1147aa47..31892e73e 100755 --- a/xCAT/postscripts/configeth +++ b/xCAT/postscripts/configeth @@ -693,10 +693,10 @@ elif [ "$1" = "-s" ];then fi if [ $networkmanager_active -eq 1 ]; then nmcli con up $con_name - wait_for_ifstate $str_inst_nic UP 10 5 else ifup $str_inst_nic fi + wait_for_ifstate $str_inst_nic UP 20 5 fi if [ $? -ne 0 ]; then log_error "bring $str_inst_nic up failed." @@ -1109,10 +1109,10 @@ else echo "bring up ip" if [ $networkmanager_active -eq 1 ]; then nmcli con up $con_name - wait_for_ifstate $str_nic_name UP 10 10 else ifup $str_nic_name fi + wait_for_ifstate $str_nic_name UP 20 5 if [ $? -ne 0 ]; then log_error "bring $str_nic_name up failed." error_code=1 From cafb5bef1054b7b4b41278bad353d0841e09e4ee Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 11:57:44 +0800 Subject: [PATCH 2/9] Put the dracut_args --omit back into /etc/kdump.conf --- xCAT/postscripts/enablekdump | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index 3a61bcfc0..6849ae13e 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -246,10 +246,8 @@ EOF echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf echo "default shell" >> /etc/kdump.conf - if (pmatch $OSVER "rhel7*") || (pmatch $OSVER "rhels7*");then - #strip "xcat" out of the initramfs for kdump - echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf - fi + #strip "xcat" out of the initramfs for kdump + echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf #strip the unnecessary kernel options from /proc/cmdline #the modified "cmdline" will be used as the kernel options #for kdump initramfs; otherwise, the "service kdump restart" will fail From b269c0067b58af0b67ba11c1429dbce6808b5bd2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 14:06:18 +0800 Subject: [PATCH 3/9] Enlarge the recommended size for tmpfs file system used for kdump over ethernet --- .../manage_clusters/common/deployment/enable_kdump.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst index d3cc84a67..17b8ea5cb 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst @@ -57,11 +57,11 @@ The kdump will create a new initrd which used in the dumping stage. The ``/tmp`` * **[RHELS]** :: - tmpfs /var/tmp tmpfs defaults,size=200m 0 2 + tmpfs /var/tmp tmpfs defaults,size=500m 0 2 * **[SLES11]** :: - tmpfs /tmp tmpfs defaults,size=200m 0 2 + tmpfs /tmp tmpfs defaults,size=500m 0 2 * **[Ubuntu]** :: From 3640ce59e1def80b8a05a1b8d1516340cdd3d811 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 15:25:17 +0800 Subject: [PATCH 4/9] Copy file /etc/os-release for kdump over ethernet on RHEL 8 --- xCAT/postscripts/enablekdump | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index 6849ae13e..c8a749e27 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -244,6 +244,8 @@ EOF #with a dummy "proc" inside, which will fake "root=nfs:$KDIP:$KDPATH" as a valid root directory [ -e $MOUNTPATH/proc ] || echo "Dummy file: fake the /proc to pass the checking of 'root=' inside dracut-cmdline " > $MOUNTPATH/proc + [ -f /etc/os-release ] && mkdir $MOUNTPATH/etc && cp /etc/os-release $MOUNTPATH/etc/os-release + echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf echo "default shell" >> /etc/kdump.conf #strip "xcat" out of the initramfs for kdump From 72303b2192811e10898512b59f8b296c5f0d93c2 Mon Sep 17 00:00:00 2001 From: litingt Date: Thu, 28 Mar 2019 04:13:24 -0400 Subject: [PATCH 5/9] update daily bundle to remove makeconservercf cases --- xCAT-test/autotest/bundle/rhels_ppc_daily.bundle | 3 --- xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle | 3 --- xCAT-test/autotest/bundle/rhels_x86_daily.bundle | 3 --- xCAT-test/autotest/bundle/sles_ppc_daily.bundle | 3 --- xCAT-test/autotest/bundle/sles_ppcle_daily.bundle | 3 --- xCAT-test/autotest/bundle/sles_x86_daily.bundle | 3 --- xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle | 3 --- xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle | 3 --- 8 files changed, 24 deletions(-) diff --git a/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle b/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle index ef275ad8e..863a65c2d 100644 --- a/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle @@ -103,9 +103,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a makedhcp_a_d makedhcp_d diff --git a/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle b/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle index ac66a4213..9184066d4 100644 --- a/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle @@ -117,9 +117,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a makedhcp_a_d makedhcp_d diff --git a/xCAT-test/autotest/bundle/rhels_x86_daily.bundle b/xCAT-test/autotest/bundle/rhels_x86_daily.bundle index fe78b52d0..8da4e59e6 100644 --- a/xCAT-test/autotest/bundle/rhels_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_x86_daily.bundle @@ -117,9 +117,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a makedhcp_a_d makedhcp_d diff --git a/xCAT-test/autotest/bundle/sles_ppc_daily.bundle b/xCAT-test/autotest/bundle/sles_ppc_daily.bundle index 2a9377444..aacf5b76c 100644 --- a/xCAT-test/autotest/bundle/sles_ppc_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppc_daily.bundle @@ -83,9 +83,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a makedhcp_a_d makedhcp_d diff --git a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle index 300ee1ea2..1e8ed265d 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle @@ -83,9 +83,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a makedhcp_a_d makedhcp_d diff --git a/xCAT-test/autotest/bundle/sles_x86_daily.bundle b/xCAT-test/autotest/bundle/sles_x86_daily.bundle index d90a2bfd5..fb00734d3 100644 --- a/xCAT-test/autotest/bundle/sles_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_daily.bundle @@ -83,9 +83,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a makedhcp_a_d makedhcp_d diff --git a/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle b/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle index b1cc64c19..f9dff496b 100644 --- a/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle @@ -55,9 +55,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a_ubuntu makedhcp_d makedhcp_n diff --git a/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle b/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle index 52fc1f477..280fb0f6e 100644 --- a/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle @@ -55,9 +55,6 @@ lsxcatd_a lsxcatd_d lsxcatd_h lsxcatd_null -makeconservercf_d -makeconservercf_noderange -makeconservercf_null makedhcp_a_ubuntu makedhcp_d makedhcp_n From 9bef9429b7f99c46e2a4982969855ab91244e3e6 Mon Sep 17 00:00:00 2001 From: huweihua Date: Thu, 28 Mar 2019 04:19:46 -0400 Subject: [PATCH 6/9] add console setup for installation related cases of packimg and cruncmdinstaller --- xCAT-test/autotest/testcase/packimg/cases0 | 18 +++++++++++++++++ xCAT-test/autotest/testcase/passwd/case0 | 20 ++++++++----------- .../autotest/testcase/runcmdinstaller/cases0 | 9 +++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/xCAT-test/autotest/testcase/packimg/cases0 b/xCAT-test/autotest/testcase/packimg/cases0 index fcad6b946..11d136998 100644 --- a/xCAT-test/autotest/testcase/packimg/cases0 +++ b/xCAT-test/autotest/testcase/packimg/cases0 @@ -60,6 +60,8 @@ os:Linux description:test packimage -m cpio -c gzip label:others,packaging,invoke_provision cmd:copycds $$ISO +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz /rootimg.cpio.gz.bak;fi cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute @@ -89,6 +91,7 @@ check:rc==0 check:output=~on / type tmpfs cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz cmd:mv -f /rootimg.cpio.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg @@ -100,6 +103,8 @@ os:Linux description:test packimage -m cpio -c pigz label:others,packaging,invoke_provision #cmd:copycds $$ISO +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz /rootimg.cpio.gz.bak;fi cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute @@ -133,6 +138,7 @@ check:rc==0 check:output=~on / type tmpfs cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz cmd:mv -f /rootimg.cpio.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg @@ -144,6 +150,8 @@ os:Linux description:test packimage -m cpio -c xz label:others,packaging,invoke_provision #cmd:copycds $$ISO +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz /rootimg.cpio.xz.bak;fi cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute @@ -173,6 +181,7 @@ check:rc==0 check:output=~on / type tmpfs cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz cmd:mv -f /rootimg.cpio.xz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg @@ -184,6 +193,8 @@ os:Linux description:test packimage -m tar -c pigz label:others,packaging,invoke_provision #cmd:copycds $$ISO +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz /rootimg.tar.gz.bak;fi cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute @@ -228,6 +239,7 @@ cmd:xdsh $$CN "userdel xcatuser" check:rc==0 cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz cmd:mv -f /rootimg.tar.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg @@ -239,6 +251,8 @@ os:Linux description:test packimage -m tar -c gzip label:others,packaging,invoke_provision #cmd:copycds $$ISO +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz /rootimg.tar.gz.bak;fi cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute @@ -279,6 +293,7 @@ cmd:xdsh $$CN "userdel xcatuser" check:rc==0 cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz cmd:mv -f /rootimg.tar.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg @@ -290,6 +305,8 @@ os:Linux description:test packimage -m tar -c xz label:others,packaging,invoke_provision #cmd:copycds $$ISO +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz /rootimg.tar.xz.bak;fi cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute @@ -330,6 +347,7 @@ cmd:xdsh $$CN "userdel xcatuser" check:rc==0 cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz cmd:mv -f /rootimg.tar.xz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg diff --git a/xCAT-test/autotest/testcase/passwd/case0 b/xCAT-test/autotest/testcase/passwd/case0 index 8cf5869ec..2b36461f2 100644 --- a/xCAT-test/autotest/testcase/passwd/case0 +++ b/xCAT-test/autotest/testcase/passwd/case0 @@ -29,10 +29,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver= check:rc==0 cmd:makedns -n check:rc==0 -cmd:makeconservercf $$CN +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi check:rc==0 -cmd:cat /etc/conserver.cf | grep $$CN -check:output=~$$CN cmd:sleep 20 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi check:rc==0 @@ -70,6 +68,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar check:rc==0 cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow end @@ -104,10 +103,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver= check:rc==0 cmd:makedns -n check:rc==0 -cmd:makeconservercf $$CN +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi check:rc==0 -cmd:cat /etc/conserver.cf | grep $$CN -check:output=~$$CN cmd:sleep 20 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi check:rc==0 @@ -145,6 +142,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar check:rc==0 cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow end @@ -179,10 +177,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver= check:rc==0 cmd:makedns -n check:rc==0 -cmd:makeconservercf $$CN +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi check:rc==0 -cmd:cat /etc/conserver.cf | grep $$CN -check:output=~$$CN cmd:sleep 20 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi check:rc==0 @@ -220,6 +216,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar check:rc==0 cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow end @@ -266,10 +263,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver= check:rc==0 cmd:makedns -n check:rc==0 -cmd:makeconservercf $$CN +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi check:rc==0 -cmd:cat /etc/conserver.cf | grep $$CN -check:output=~$$CN cmd:sleep 20 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi check:rc==0 @@ -307,5 +302,6 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar check:rc==0 cmd:oldpassword=`cat /tmp/tmppassword |sed 's/\"//g'`;oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.password=$oldpassword passwd.cryptmethod=$oldcryptmethod check:rc==0 +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi cmd:rm -rf /tmp/tmpcryptmethod /tmp/tmppassword /tmp/shadow end diff --git a/xCAT-test/autotest/testcase/runcmdinstaller/cases0 b/xCAT-test/autotest/testcase/runcmdinstaller/cases0 index d81df8c25..b741d6af6 100644 --- a/xCAT-test/autotest/testcase/runcmdinstaller/cases0 +++ b/xCAT-test/autotest/testcase/runcmdinstaller/cases0 @@ -5,9 +5,12 @@ cmd:runcmdinstaller -h check:rc==0 check:output=~runcmdinstaller end + start:runcmdinstaller_command description:runcmdinstaller label:others,postscripts +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:chtab key=xcatdebugmode site.value="2" check:rc==0 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute @@ -19,10 +22,14 @@ cmd:runcmdinstaller $$CN "ls /" check:rc==0 check:output=~tmp cmd:chtab key=xcatdebugmode site.value="0" +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi end + start:get_xcat_postscripts_loginfo description:get xcat post scripts loginfo label:others,postscripts +cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi +check:rc==0 cmd:chtab key=xcatdebugmode site.value="1" check:rc==0 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute @@ -34,7 +41,9 @@ cmd:rc==0 cmd:cat /var/log/messages /var/log/xcat/computes.log 2>/dev/null | grep "program: ++" cmd:rc==0 cmd:chtab key=xcatdebugmode site.value="0" +cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi end + start:updatenode_postscripts_loginfo description:get updatenode postsripts log info label:others,postscripts From 132df89d77c5c7083016ebc1f35f03edd6a08efe Mon Sep 17 00:00:00 2001 From: xuweibj Date: Wed, 27 Mar 2019 22:20:02 -0400 Subject: [PATCH 7/9] stop conserver service in makeconservercf cases --- xCAT-test/autotest/testcase/makeconservercf/cases0 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/makeconservercf/cases0 b/xCAT-test/autotest/testcase/makeconservercf/cases0 index d1f2e20c1..22a98a26d 100644 --- a/xCAT-test/autotest/testcase/makeconservercf/cases0 +++ b/xCAT-test/autotest/testcase/makeconservercf/cases0 @@ -1,5 +1,5 @@ start:makeconservercf_null -label:others,ci_test +label:others,conserver cmd:chdef -t node -o testnodetmp cons=hmc groups=all cmd:service goconserver stop cmd:#!/bin/bash @@ -26,11 +26,12 @@ else exit $? fi check:rc==0 +cmd:service conserver stop cmd:rmdef -t node testnodetmp end start:makeconservercf_noderange -label:others,ci_test +label:others,conserver cmd:chdef -t node -o testnodetmp cons=hmc groups=all cmd:service goconserver stop cmd:#!/bin/bash @@ -68,10 +69,11 @@ else fi check:rc==0 cmd:rmdef -t node testnodetmp +cmd:service conserver stop end start:makeconservercf_d -label:others,ci_test +label:others,conserver cmd:chdef -t node -o testnodetmp cons=hmc groups=all cmd:service goconserver stop cmd:#!/bin/bash @@ -115,6 +117,7 @@ fi check:rc==0 cmd:cat /etc/conserver.cf | grep testnodetmp check:output!~testnodetmp +cmd:service conserver stop cmd:rmdef -t node testnodetmp end From 25bd151335764a7b65b194d8c4a07a3d1c3a163f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 17:01:06 +0800 Subject: [PATCH 8/9] Donot add kernel argument root= on RHEL 8 --- xCAT/postscripts/enablekdump | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index c8a749e27..af1d137b3 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -262,7 +262,9 @@ EOF fi done sed -i "s#^[\t ]*KDUMP_COMMANDLINE=\"#KDUMP_COMMANDLINE=\"$kdumpcmdline#" /etc/sysconfig/kdump - sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump + if (pmatch $OSVER "rhel7*") || (pmatch $OSVER "rhels7*"); then + sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump + fi [ -f /etc/dracut.conf ] && mv /etc/dracut.conf /tmp/dracut.conf restartservice kdump [ -f /tmp/dracut.conf ] && mv /tmp/dracut.conf /etc/dracut.conf From 6cb7aa0eb208e11763371068c275cbdea07e0fb8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 17:01:08 +0800 Subject: [PATCH 9/9] Revert "Copy file /etc/os-release for kdump over ethernet on RHEL 8" This reverts commit 3640ce59e1def80b8a05a1b8d1516340cdd3d811. --- xCAT/postscripts/enablekdump | 2 -- 1 file changed, 2 deletions(-) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index af1d137b3..92fd65881 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -244,8 +244,6 @@ EOF #with a dummy "proc" inside, which will fake "root=nfs:$KDIP:$KDPATH" as a valid root directory [ -e $MOUNTPATH/proc ] || echo "Dummy file: fake the /proc to pass the checking of 'root=' inside dracut-cmdline " > $MOUNTPATH/proc - [ -f /etc/os-release ] && mkdir $MOUNTPATH/etc && cp /etc/os-release $MOUNTPATH/etc/os-release - echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf echo "default shell" >> /etc/kdump.conf #strip "xcat" out of the initramfs for kdump