Merge branch 'cherrypick-443-24.05' into 'slurm-24.05'

Cherry-pick !443 into slurm-24.05

See merge request SchedMD/dev/slurm!445

Author: agilmor

testsuite/expect/test7.11

@@ -221,15 +221,9 @@ expect {
 }
 
 sleep 30
-if {![param_contains [get_config_param "SlurmctldParameters"] "enable_configless"]} {
-	make_bash_script $file_in "
-	$srun --test_suite_srun=5 $bin_sum $spank_conf_file
-	"
-} else {
-	make_bash_script $file_in "
-	$srun --test_suite_srun=5 $bin_sum /run/slurm/conf/plugstack.conf
-	"
-}
+make_bash_script $file_in "
+$srun --test_suite_srun=5 $bin_sum $spank_conf_file
+"
 
 set matches 0
 spawn $sbatch --test_suite_sbatch=4 -N1 -t1 -o $file_out $file_in

testsuite/expect/test7.22

@@ -42,6 +42,10 @@ if {[get_config_param "SchedulerType"] ne "sched/backfill"} {
 	skip "This test requires SchedulerType = sched/backfill"
 }
 
+if {[string first "bf_min_prio_reserve" [get_config_param "SchedulerParameters"]] != -1} {
+	skip "This test cannot work with bf_min_prio_reserve"
+}
+
 if {$nodes_avail < $nodes_min} {
 	skip "Not enough nodes currently available ($nodes_avail avail < $nodes_min needed)."
 }