rms/slurm: re-enable pmix in slurm

Signed-off-by: Adrian Reber <areber@redhat.com>
openhpc · Jul 24, 2023 · 65e055c · 65e055c
1 parent 1783619
commit 65e055c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/components/rms/slurm/SPECS/slurm.spec b/components/rms/slurm/SPECS/slurm.spec
@@ -10,7 +10,7 @@
 
 %include %{_sourcedir}/OHPC_macros
 %global _with_mysql  1
-#global _with_pmix --with-pmix=%{OHPC_ADMIN}/pmix
+%global _with_pmix --with-pmix=%{OHPC_ADMIN}/pmix
 %global _with_hwloc 1
 %global _with_numa 1
 %global _with_slurmrestd 1
@@ -393,6 +393,9 @@ select information.
 %if 0%{?rhel} || 0%{?openEuler}
 export PATH="$PWD/bin:$PATH"
 %endif
+%if %{with pmix}
+module load hwloc
+%endif
 %configure \
 	%{?_without_debug:--disable-debug} \
 	%{?_with_pam_dir} \

diff --git a/tests/common/functions b/tests/common/functions
@@ -262,6 +262,8 @@ run_mpi_binary () {
     if [ "$RESOURCE_MANAGER" = "slurm" ]; then
 		if [ ! -z "$SIMPLE_CI" ]; then
 			timeout=5		# default job timeout (in minutes)
+			# Do not use pmix in the SIMPLE_CI case (GitHub Actions)
+			unset OHPC_MPI_LAUNCHERS
 		else
 			timeout=2		# default job timeout (in minutes)
 		fi