xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-07-31 10:09:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7677 from VersatusHPC/fix/xcat-core-matrix-build

Browse Source 
fix(xcat-core) Fixes to get internal CI green
This commit is contained in:
Daniel Hilst
2026-07-28 16:33:08 -03:00
committed by GitHub
parent 036bb24c87 851284067d
commit c811f2b1bd
9 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/perl/xCAT/Goconserver.pm
+4 -12
View File
@@ -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;
}
xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.exlist
Symlink
+1
View File
@@ -0,0 +1 @@
../rh/compute.rhels8.ppc64le.exlist
xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.pkglist
Symlink
+1
View File
@@ -0,0 +1 @@
../rh/compute.rhels8.ppc64le.pkglist
xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.postinstall
Symlink
+1
View File
@@ -0,0 +1 @@
../rh/compute.rhels8.ppc64le.postinstall
xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.exlist
Symlink
+1
View File
@@ -0,0 +1 @@
../rh/compute.rhels9.ppc64le.exlist
xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.pkglist
Symlink
+1
View File
@@ -0,0 +1 @@
../rh/compute.rhels9.ppc64le.pkglist
xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.postinstall
Symlink
+1
View File
@@ -0,0 +1 @@
../rh/compute.rhels9.ppc64le.postinstall
xCAT-server/share/xcat/netboot/rh/compute.rhels9.ppc64le.pkglist
+30
View File
@@ -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
xCAT-test/autotest/testcase/commoncmd/retry_install.sh
+2 -2
View File
@@ -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