diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm index 324d8e451..c5ed88fcb 100644 --- a/xCAT-server/lib/perl/xCAT/Goconserver.pm +++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm @@ -667,9 +667,7 @@ sub build_conf { #------------------------------------------------------------------------------- sub start_service { - my $cmd = "service goconserver start"; - xCAT::Utils->runcmd($cmd, -1); - if ($::RUNCMD_RC != 0) { + if (xCAT::Utils->startservice("goconserver") != 0) { xCAT::MsgUtils->message("S", "Could not start goconserver service."); return 1; } @@ -694,9 +692,7 @@ sub start_service { #------------------------------------------------------------------------------- sub stop_service { - my $cmd = "service goconserver stop"; - xCAT::Utils->runcmd($cmd, -1); - if ($::RUNCMD_RC != 0) { + if (xCAT::Utils->stopservice("goconserver") != 0) { xCAT::MsgUtils->message("S", "Could not stop goconserver service."); return 1; } @@ -721,9 +717,7 @@ sub stop_service { #------------------------------------------------------------------------------- sub stop_conserver_service { - my $cmd = "service conserver stop"; - xCAT::Utils->runcmd($cmd, -1); - if ($::RUNCMD_RC != 0) { + if (xCAT::Utils->stopservice("conserver") != 0) { xCAT::MsgUtils->message("S", "Could not stop conserver service."); return 1; } @@ -747,9 +741,7 @@ sub stop_conserver_service { #------------------------------------------------------------------------------- sub restart_service { - my $cmd = "service goconserver restart"; - xCAT::Utils->runcmd($cmd, -1); - if ($::RUNCMD_RC != 0) { + if (xCAT::Utils->restartservice("goconserver") != 0) { xCAT::MsgUtils->message("S", "Could not restart goconserver service."); return 1; } diff --git a/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.exlist b/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.exlist new file mode 120000 index 000000000..f468ba7e1 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.exlist @@ -0,0 +1 @@ +../rh/compute.rhels8.ppc64le.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.pkglist new file mode 120000 index 000000000..38195cc33 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels8.ppc64le.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.postinstall b/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.postinstall new file mode 120000 index 000000000..011158f7b --- /dev/null +++ b/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.postinstall @@ -0,0 +1 @@ +../rh/compute.rhels8.ppc64le.postinstall \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.exlist b/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.exlist new file mode 120000 index 000000000..47be8bdca --- /dev/null +++ b/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.exlist @@ -0,0 +1 @@ +../rh/compute.rhels9.ppc64le.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.pkglist new file mode 120000 index 000000000..1674eb9b3 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels9.ppc64le.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.postinstall b/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.postinstall new file mode 120000 index 000000000..1299428cb --- /dev/null +++ b/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.postinstall @@ -0,0 +1 @@ +../rh/compute.rhels9.ppc64le.postinstall \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels9.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels9.ppc64le.pkglist new file mode 100644 index 000000000..635bd5046 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels9.ppc64le.pkglist @@ -0,0 +1,30 @@ +@minimal-environment +chrony +kernel +net-tools +nfs-utils +openssh-server +rsync +tar +util-linux +wget +python3 +tar +bzip2 +bc +dracut +dracut-network +rsyslog +hostname +e2fsprogs +ethtool +parted +openssl +dhclient +openssh-clients +bash +vim-minimal +rpm +iputils +perl-interpreter + diff --git a/xCAT-test/autotest/testcase/commoncmd/retry_install.sh b/xCAT-test/autotest/testcase/commoncmd/retry_install.sh index 7c90298ca..9f4c9e24e 100755 --- a/xCAT-test/autotest/testcase/commoncmd/retry_install.sh +++ b/xCAT-test/autotest/testcase/commoncmd/retry_install.sh @@ -6,8 +6,8 @@ declare -i tryreinstall=1 node=$1 osimage=$2 vmhost=`lsdef $node -i vmhost -c | cut -d '=' -f 2` -times=3 -wait_for_provision=30 #Min to wait for node to provision +times=2 +wait_for_provision=20 #Min to wait for node to provision check_status=10 #Sec to keep checking status iterations=$wait_for_provision*60/$check_status #Iterations to check for "booted" status