From 819f5ebe718d2419cb883c2e01be66a16a49f3c7 Mon Sep 17 00:00:00 2001
From: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Date: Tue, 28 Jul 2026 16:33:28 -0300
Subject: [PATCH] Revert "fix(xcat-core) Fixes to get internal CI green"

---
 xCAT-server/lib/perl/xCAT/Goconserver.pm      | 16 +++++++---
 .../netboot/alma/compute.alma8.ppc64le.exlist |  1 -
 .../alma/compute.alma8.ppc64le.pkglist        |  1 -
 .../alma/compute.alma8.ppc64le.postinstall    |  1 -
 .../netboot/alma/compute.alma9.ppc64le.exlist |  1 -
 .../alma/compute.alma9.ppc64le.pkglist        |  1 -
 .../alma/compute.alma9.ppc64le.postinstall    |  1 -
 .../netboot/rh/compute.rhels9.ppc64le.pkglist | 30 -------------------
 .../testcase/commoncmd/retry_install.sh       |  4 +--
 9 files changed, 14 insertions(+), 42 deletions(-)
 delete mode 120000 xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.exlist
 delete mode 120000 xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.pkglist
 delete mode 120000 xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.postinstall
 delete mode 120000 xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.exlist
 delete mode 120000 xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.pkglist
 delete mode 120000 xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.postinstall
 delete mode 100644 xCAT-server/share/xcat/netboot/rh/compute.rhels9.ppc64le.pkglist

diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm
index c5ed88fcb..324d8e451 100644
--- a/xCAT-server/lib/perl/xCAT/Goconserver.pm
+++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm
@@ -667,7 +667,9 @@ sub build_conf {
 
 #-------------------------------------------------------------------------------
 sub start_service {
-    if (xCAT::Utils->startservice("goconserver") != 0) {
+    my $cmd = "service goconserver start";
+    xCAT::Utils->runcmd($cmd, -1);
+    if ($::RUNCMD_RC != 0) {
         xCAT::MsgUtils->message("S", "Could not start goconserver service.");
         return 1;
     }
@@ -692,7 +694,9 @@ sub start_service {
 
 #-------------------------------------------------------------------------------
 sub stop_service {
-    if (xCAT::Utils->stopservice("goconserver") != 0) {
+    my $cmd = "service goconserver stop";
+    xCAT::Utils->runcmd($cmd, -1);
+    if ($::RUNCMD_RC != 0) {
         xCAT::MsgUtils->message("S", "Could not stop goconserver service.");
         return 1;
     }
@@ -717,7 +721,9 @@ sub stop_service {
 
 #-------------------------------------------------------------------------------
 sub stop_conserver_service {
-    if (xCAT::Utils->stopservice("conserver") != 0) {
+    my $cmd = "service conserver stop";
+    xCAT::Utils->runcmd($cmd, -1);
+    if ($::RUNCMD_RC != 0) {
         xCAT::MsgUtils->message("S", "Could not stop conserver service.");
         return 1;
     }
@@ -741,7 +747,9 @@ sub stop_conserver_service {
 
 #-------------------------------------------------------------------------------
 sub restart_service {
-    if (xCAT::Utils->restartservice("goconserver") != 0) {
+    my $cmd = "service goconserver restart";
+    xCAT::Utils->runcmd($cmd, -1);
+    if ($::RUNCMD_RC != 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
deleted file mode 120000
index f468ba7e1..000000000
--- a/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.exlist
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 120000
index 38195cc33..000000000
--- a/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 120000
index 011158f7b..000000000
--- a/xCAT-server/share/xcat/netboot/alma/compute.alma8.ppc64le.postinstall
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 120000
index 47be8bdca..000000000
--- a/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.exlist
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 120000
index 1674eb9b3..000000000
--- a/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 120000
index 1299428cb..000000000
--- a/xCAT-server/share/xcat/netboot/alma/compute.alma9.ppc64le.postinstall
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 100644
index 635bd5046..000000000
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels9.ppc64le.pkglist
+++ /dev/null
@@ -1,30 +0,0 @@
-@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 9f4c9e24e..7c90298ca 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=2
-wait_for_provision=20 #Min to wait for node to provision
+times=3
+wait_for_provision=30 #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