I knew this felt familiar

natefoo · Oct 9, 2024 · 9f91d07 · 9f91d07
1 parent 9e2839d
commit 9f91d07
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.ci/runslurm.sh b/.ci/runslurm.sh
@@ -36,7 +36,7 @@ cp -p /ci/slurmdbd.conf /ci/slurm.conf /etc/slurm
 chmod 0600 /etc/slurm/slurmdbd.conf
 chown slurm:slurm /etc/slurm/slurmdbd.conf
 # disable cgroupv2 usage in slurmd in newer Slurms
-[ ${SLURM_VERSION%.*} -ge 22 ] && echo 'CgroupPlugin=cgroup/v1' > /etc/slurm/cgroup.conf
+[ ${SLURM_VERSION} == 'apt' -o ${SLURM_VERSION%.*} -ge 22 ] && echo 'CgroupPlugin=cgroup/v1' > /etc/slurm/cgroup.conf
 slurmdbd
 { set +x; }  2>/dev/null
 while [ -z "`sacctmgr -no list stats`" ]; do echo "waiting for slurmdbd responsiveness..."; sleep 1; done

diff --git a/.ci/slurm.conf b/.ci/slurm.conf
@@ -14,6 +14,4 @@ AccountingStorageHost=localhost
 AccountingStoragePort=6819
 MinJobAge=10
 JobAcctGatherType=jobacct_gather/none
-ProctrackType=proctrack/linuxproc
-TaskPlugin=task/none
 PartitionName=debug Nodes=localhost Default=YES MaxTime=INFINITE State=UP