From 09863c5e921b81d8b95bf0a8ce0fd8ea3fa33c76 Mon Sep 17 00:00:00 2001
From: Priyanka Kini J <pjanardh@amd.com>
Date: Wed, 28 Jan 2026 04:39:28 -0800
Subject: [PATCH] Fix minor installation issues

---
 tests/enroot/config/install_enroot.sh |  9 +++++----
 tests/enroot/config/install_pyxis.sh  |  5 +++--
 tests/enroot/config/install_slurm.sh  | 22 ++++++++++++++++------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/tests/enroot/config/install_enroot.sh b/tests/enroot/config/install_enroot.sh
index b5ad1ef..48341d2 100644
--- a/tests/enroot/config/install_enroot.sh
+++ b/tests/enroot/config/install_enroot.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 set -euo pipefail
-export sudo DEBIAN_FRONTEND=noninteractive
+export DEBIAN_FRONTEND=noninteractive
 
 sudo grep -qxF "nameserver 8.8.8.8" /etc/resolv.conf || sudo sh -c 'echo "nameserver 8.8.8.8" >> /etc/resolv.conf'
 mkdir -p enroot
@@ -60,9 +60,10 @@ wget -c "$CAPS_URL" || {
 }
 
 echo "Enroot and Enroot+caps (.deb) downloaded successfully"
-
-sudo apt install -y ./*.deb
-yes "Y" | sudo apt --fix-broken install
+sudo DEBIAN_FRONTEND=noninteractive apt-get update
+sudo DEBIAN_FRONTEND=noninteractive apt-get -y -f install
+sudo DEBIAN_FRONTEND=noninteractive apt-get -y install ./*.deb
 enroot version 
 which enroot
 hash -r
+
diff --git a/tests/enroot/config/install_pyxis.sh b/tests/enroot/config/install_pyxis.sh
index aec46ff..edac0cc 100644
--- a/tests/enroot/config/install_pyxis.sh
+++ b/tests/enroot/config/install_pyxis.sh
@@ -23,7 +23,7 @@ mkdir -p pyxis_main
 cd pyxis_main
 git clone https://github.com/NVIDIA/pyxis
 cd pyxis && pwd && make orig && make deb
-sudo dpkg -i --force-depends ../nvslurm-plugin-pyxis_*_amd64.deb
+sudo dpkg -i ../nvslurm-plugin-pyxis_*_amd64.deb
 sudo mkdir /etc/slurm/plugstack.conf.d
 sudo ln -s /usr/share/pyxis/pyxis.conf /etc/slurm/plugstack.conf.d/pyxis.conf
 sudo touch /etc/slurm/plugstack.conf
@@ -31,4 +31,5 @@ echo "include /etc/slurm/plugstack.conf.d/*" | sudo tee -a /etc/slurm/plugstack.
 sudo systemctl restart slurmctld slurmd
 srun -h | grep container-image
 cd ../../
-sudo rm -rf pyxis_main
\ No newline at end of file
+sudo rm -rf pyxis_main
+
diff --git a/tests/enroot/config/install_slurm.sh b/tests/enroot/config/install_slurm.sh
index f983856..c037d40 100644
--- a/tests/enroot/config/install_slurm.sh
+++ b/tests/enroot/config/install_slurm.sh
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 set -x
+SLURM_DIR="/tmp/slurm"
 export DEBIAN_FRONTEND=noninteractive
 sudo grep -qxF "nameserver 8.8.8.8" /etc/resolv.conf || sudo sh -c 'echo "nameserver 8.8.8.8" >> /etc/resolv.conf'
 export SLURMUSER=1003
@@ -38,8 +39,8 @@ yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt-get install build-essential fa
 yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt upgrade
 yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt install libpmix-dev libpmix2
 pwd
-mkdir /tmp/slurm
-cd /tmp/slurm
+mkdir $SLURM_DIR
+cd $SLURM_DIR
 pwd
 # Code to fetch the latest stable slurm version 
 SLURM_VERSION="${1:-latest}"
@@ -84,7 +85,15 @@ sudo sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
 cd "$EXTRACTED_DIR"
 pwd
 sudo DEBIAN_FRONTEND=noninteractive mk-build-deps -i -t 'apt-get -y --no-install-recommends' debian/control
-yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt install libmunge-dev libgtk2.0-dev libpam0g-dev libperl-dev liblua5.3-dev libhwloc-dev dh-exec 
+# Pinning hwloc version 2.7 for slurm compatibility
+sudo tee /etc/apt/preferences.d/hwloc-pin <<'EOF'
+Package: hwloc libhwloc-dev libhwloc15 libhwloc-plugins
+Pin: version 2.*
+Pin-Priority: 1001
+EOF
+yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt update
+yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt install -y libhwloc-dev hwloc
+yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt install libmunge-dev libgtk2.0-dev libpam0g-dev libperl-dev liblua5.3-dev dh-exec 
 yes "Y" | DEBIAN_FRONTEND=noninteractive sudo apt install libdbus-1-dev librdkafka
 sudo groupadd slurm
 sudo useradd -m -r -s /bin/false -d /tmp/slurm -g slurm slurm
@@ -98,7 +107,8 @@ sudo chown -R slurm:slurm /var/spool/slurm/savestate
 sudo chown -R slurm:slurm /var/spool/slurmd
 sudo chown -R slurm:slurm /var/log/slurmctld.log
 cd ../ && DEBIAN_FRONTEND=noninteractive sudo dpkg -i slurm-*.deb
-systemctl restart slurmctld
-systemctl restart slurmd
+sudo systemctl restart slurmctld
+sudo systemctl restart slurmd
 sinfo
-
+cd 
+sudo rm -rf $SLURM_DIR